Merge with master

Author: perki

package.json

@@ -28,8 +28,8 @@
     "webserver-test": "node node_modules/.bin/rec-la ./tests/webpage-auth/ 5443"
   },
   "dependencies": {
-    "lodash": "^4.17.21",
-    "marked": "^0.5.2",
+    "lodash": "^4.17.20",
+    "marked": "^0.7.0",
     "mkdirp": "0",
     "pryv": "^2.0.7",
     "vue": "^2.5.2",
@@ -98,7 +98,7 @@
     "vue-template-compiler": "^2.5.17",
     "webpack": "^3.6.0",
     "webpack-bundle-analyzer": "^2.9.0",
-    "webpack-dev-server": "^2.11.0",
+    "webpack-dev-server": "^3.1.11",
     "webpack-merge": "^4.1.0"
   },
   "engines": {