Merge commit 'c0c1e47f1c427faa8559bd43fff6eb419ccb26e5'

Author: radiolips

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-- 5.7.0
+- 7.7.2
 env:
 - CXX=g++-4.8
 addons:
@@ -10,11 +10,12 @@ addons:
     packages:
     - g++-4.8
 before_install:
-- npm install -g protractor
+- npm install -g protractor@3.3.0
 install:
 - npm install -g npm@2
 - npm install -g grunt-cli
 - npm install -g bower
+- npm install selenium-webdriver
 - bower install
 - npm install
 - ./node_modules/protractor/bin/webdriver-manager update --standalone
@@ -25,7 +26,7 @@ before_script:
 script:
 - npm run build
 - npm test
-- grunt e2e-test
+# - grunt e2e-test
 notifications:
   slack:
     secure: iGLGsYyVIyKVpVVCskGh/zc6Pkqe0D7jpUtbywSbnq6l5seE6bvBVqm0F2FSCIN+AIC+qal2mPEWysDVsLACm5tTEeA8NfL8dmCrAKbiFbi+gHl4mnHHCHl7ii/7UkoIIXNc5UXbgMSXRS5l8UcsSDlN8VxC5zWstbJvjeYIvbA=

Gruntfile.js

@@ -4,7 +4,6 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-contrib-cssmin');
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-contrib-uglify');
-    grunt.loadNpmTasks('grunt-doctoc');
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-jscs');
     grunt.loadNpmTasks('grunt-contrib-watch');
@@ -58,27 +57,6 @@ module.exports = function(grunt) {
             }
         },
 
-        doctoc: {
-            options: {
-                removeAd: false
-            },
-            readme: {
-                options: {
-                    target: './README.md'
-                }
-            },
-            doc: {
-                options: {
-                    target: './doc/README.md'
-                }
-            },
-            faq: {
-                options: {
-                    target: './doc/FAQ.md'
-                }
-            },
-        },
-
         jshint: {
             all: ['src/*.js']
         },
@@ -99,13 +77,7 @@ module.exports = function(grunt) {
                 tasks: ['sass', 'cssmin'],
                 options: {
                 },
-            },
-            docs: {
-                files: ['README.md', 'doc/README.md', 'doc/FAQ.md'],
-                tasks: ['doctoc'],
-                options: {
-                },
-            },
+            }
         },
 
         protractor: {
@@ -134,6 +106,6 @@ module.exports = function(grunt) {
         }
     });
 
-    grunt.registerTask('default', ['sass', 'cssmin', 'jshint', 'jscs', 'copy', 'uglify', 'doctoc']);
+    grunt.registerTask('default', ['sass', 'cssmin', 'jshint', 'jscs', 'copy', 'uglify']);
     grunt.registerTask('e2e-test', ['connect', 'protractor_webdriver', 'protractor']);
 };

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2016 Pavel Reznikov, Dylan Weiss
+Copyright (c) 2014-2017 Pavel Reznikov, Dylan Weiss
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal