Merge branch 'master' into services

package.json

@@ -125,9 +125,11 @@
     "google": "^2.1.0",
     "iconv-lite": "^0.4.19",
     "ipaddr.js": "^1.5.4",
+    "is-running": "^2.1.0",
     "json-socket": "^0.3.0",
     "lodash": "^4.17.5",
     "material-ui": "^0.20.0",
+    "mime": "^2.3.1",
     "moment": "^2.20.1",
     "mysql": "^2.15.0",
     "nat-upnp": "^1.1.1",