Merge branch 'develop' into master

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "magicmirror",
-  "version": "2.3.1",
+  "version": "2.4.0-dev",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -37,11 +37,6 @@
         }
       }
     },
-    "@types/node": {
-      "version": "7.0.57",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.57.tgz",
-      "integrity": "sha512-Iikf0IAus1OX++3Jrc1R2bsZggO+m22G5ee56JccYKejx5GNT3nHhY8v6J4OXId1hXXlb0n45hcaVwZwQcZZ6w=="
-    },
     "JSV": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
@@ -1572,13 +1567,20 @@
       "dev": true
     },
     "electron": {
-      "version": "1.7.13",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-1.7.13.tgz",
-      "integrity": "sha1-EIUbrsd9aG2VgS80QlwX5IrBQT8=",
+      "version": "2.0.0-beta.7",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-2.0.0-beta.7.tgz",
+      "integrity": "sha512-DSUHGT2JkZc4pja2JdlG+TJa/nX2tz2I9UHdYPY0iKUrZngmTpP2FUypVt5pK+O9v0set5sL1lu1Y7c2dG4DDQ==",
       "requires": {
-        "@types/node": "7.0.57",
+        "@types/node": "8.10.2",
         "electron-download": "3.3.0",
         "extract-zip": "1.6.5"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "8.10.2",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.2.tgz",
+          "integrity": "sha512-A6Uv1anbsCvrRDtaUXS2xZ5tlzD+Kg7yMRlSLFDy3z0r7KlGXDzL14vELXIAgpk2aJbU3XeZZQRcEkLkowT92g=="
+        }
       }
     },
     "electron-download": {