Merge remote-tracking branch 'symphony/master' into skynet

# Conflicts:
#	installer/win/Symphony-x64.aip
#	js/main.js
#	package.json

package.json

@@ -1,7 +1,8 @@
 {
   "name": "Symphony",
   "productName": "Symphony",
-  "version": "1.0.1",
+  "version": "2.0.0",
+  "buildNumber": "",
   "description": "Symphony desktop app (Foundation ODP)",
   "author": "Symphony",
   "main": "js/main.js",
@@ -28,7 +29,9 @@
     "transformIgnorePatterns": []
   },
   "build": {
-    "asarUnpack": ["node_modules/@paulcbetts/cld/build/Release/cld.node"],
+    "asarUnpack": [
+      "node_modules/@paulcbetts/cld/build/Release/cld.node"
+    ],
     "files": [
       "!coverage/*",
       "!installer/*",
@@ -80,7 +83,7 @@
   "devDependencies": {
     "browserify": "^14.1.0",
     "cross-env": "^3.2.4",
-    "electron": "1.7.5",
+    "electron": "1.7.8",
     "electron-builder": "^13.9.0",
     "electron-builder-squirrel-windows": "^12.3.0",
     "electron-packager": "^8.5.2",
@@ -103,12 +106,16 @@
     "async.mapseries": "^0.5.2",
     "auto-launch": "^5.0.1",
     "electron-dl": "^1.9.0",
-    "electron-spellchecker": "^1.2.0",
+    "electron-log": "^2.2.7",
+    "electron-spellchecker": "^1.1.2",
     "electron-squirrel-startup": "^1.0.0",
     "extract-zip": "^1.6.5",
     "ffi": "^2.2.0",
     "filesize": "^3.5.10",
     "keymirror": "0.1.1",
+    "lodash.omit": "^4.5.0",
+    "lodash.pick": "^4.4.0",
+    "lodash.difference": "^4.5.0",
     "randomstring": "^1.1.5",
     "ref": "^1.3.4",
     "winreg": "^1.2.3"