Merge branch 'develop' into newservermode

package.json

@@ -1,6 +1,6 @@
 {
   "name": "magicmirror",
-  "version": "2.9.0",
+  "version": "2.10.0-develop",
   "description": "The open source modular smart mirror platform.",
   "main": "js/electron.js",
   "scripts": {
@@ -60,6 +60,8 @@
   },
   "dependencies": {
     "colors": "^1.1.2",
+    "console-stamp": "^0.2.9",
+    "electron": "^3.0.13",
     "express": "^4.16.2",
     "express-ipfilter": "^1.0.1",
     "feedme": "latest",