Merge branch 'develop' into master

package.json

@@ -1,6 +1,6 @@
 {
   "name": "magicmirror",
-  "version": "2.3.1",
+  "version": "2.4.0-dev",
   "description": "The open source modular smart mirror platform.",
   "main": "js/electron.js",
   "scripts": {
@@ -57,7 +57,7 @@
   "dependencies": {
     "body-parser": "^1.18.2",
     "colors": "^1.1.2",
-    "electron": "^1.4.15",
+    "electron": "beta",
     "express": "^4.16.2",
     "express-ipfilter": "0.3.1",
     "feedme": "latest",