Merge dev

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 sudo: required
 node_js:
-  - 8.1.4
+  - "8.4.0"
 matrix:
   fast_finish: true
 services:

package.json

@@ -47,14 +47,15 @@
     }
   },
   "engines": {
-    "node": "8.1.4"
+    "node": "8.4.0"
   },
   "dependencies": {
+    "ajv": "^5.2.2",
     "async": "^0.9.2",
-    "body-parser": "^1.17.2",
+    "body-parser": "^1.18.0",
     "bootevent": "0.0.1",
     "compression": "^1.7.0",
-    "css-loader": "^0.28.4",
+    "css-loader": "^0.28.7",
     "cssmin": "^0.4.3",
     "d3": "^3.5.17",
     "ejs": "^2.5.7",
@@ -74,7 +75,7 @@
     "jquery-ui-bundle": "^1.12.1",
     "jquery.tipsy": "^1.0.3",
     "js-storage": "^1.0.1",
-    "jsonwebtoken": "^7.4.2",
+    "jsonwebtoken": "^7.4.3",
     "lodash": "^4.17.4",
     "long": "^3.2.0",
     "mfb": "^0.12.0",
@@ -100,8 +101,9 @@
     "sugar": "^1.5.0",
     "sync-exec": "^0.6.2",
     "traverse": "^0.6.6",
-    "uglify-js": "^3.0.27",
-    "webpack": "^3.5.4"
+    "uglify-js": "^3.1.0",
+    "uuid": "^3.1.0",
+    "webpack": "^3.5.6"
   },
   "devDependencies": {
     "benv": "3.3.0",

tests/admintools.test.js

@@ -57,7 +57,7 @@ var someData = {
 
 describe('admintools', function ( ) {
   var self = this;
-  this.timeout(50000);
+  this.timeout(30000);
   before(function (done) {
     benv.setup(function() {
 

tests/fixtures/headless.js

@@ -172,4 +172,3 @@ function headless (benv, binding) {
 }
 
 module.exports = headless;
-