Merge branch 'master' into greenkeeper/@types/chai-4.0.1

package.json

@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "@types/bcryptjs": "2.4.0",
-    "@types/body-parser": "1.16.3",
+    "@types/body-parser": "1.16.4",
     "@types/chai": "4.0.1",
     "@types/chai-http": "0.0.30",
     "@types/chalk": "0.4.31",
@@ -52,7 +52,7 @@
     "@types/morgan": "1.7.32",
     "@types/ms": "0.7.29",
     "@types/multer": "1.3.2",
-    "@types/node": "7.0.31",
+    "@types/node": "8.0.2",
     "@types/ratelimiter": "2.1.28",
     "@types/redis": "2.6.0",
     "@types/request": "0.0.44",
@@ -86,7 +86,7 @@
     "stylus-loader": "3.0.1",
     "swagger-jsdoc": "1.9.4",
     "tslint": "5.4.3",
-    "uglify-es": "3.0.19",
+    "uglify-es": "3.0.20",
     "uglify-es-webpack-plugin": "0.0.2",
     "uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony",
     "webpack": "2.6.1"
@@ -135,7 +135,7 @@
     "redis": "2.7.1",
     "request": "2.81.0",
     "rimraf": "2.6.1",
-    "riot": "3.6.0",
+    "riot": "3.6.1",
     "rndstr": "1.0.0",
     "s-age": "1.1.0",
     "serve-favicon": "2.4.3",