Merge branch 'master' of https://github.com/chentsulin/electron-react-boilerplate into electron-builder

Author: amilajack

.eslintrc

@@ -16,7 +16,6 @@
     "no-use-before-define": "off",
     "promise/param-names": 2,
     "promise/always-return": 2,
-    "promise/always-catch": 2, // deprecated
     "promise/catch-or-return": 2,
     "promise/no-native": 0,
     "react/jsx-no-bind": "off",

package.json

@@ -88,7 +88,7 @@
     "babel-loader": "^6.2.5",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-dev-expression": "^0.2.1",
-    "babel-plugin-tcomb": "^0.3.17",
+    "babel-plugin-tcomb": "^0.3.19",
     "babel-plugin-webpack-loaders": "^0.8.0",
     "babel-polyfill": "^6.16.0",
     "babel-preset-es2015": "^6.16.0",
@@ -100,35 +100,34 @@
     "boiler-room-custodian": "^0.4.2",
     "chai": "^3.5.0",
     "concurrently": "^3.1.0",
-    "cross-env": "^3.1.1",
+    "cross-env": "^3.1.3",
     "css-loader": "^0.25.0",
     "css-modules-require-hook": "^4.0.5",
     "del": "^2.2.2",
-    "devtron": "^1.3.0",
-    "electron": "^1.4.3",
-    "electron-builder": "^5.26.0",
+    "devtron": "^1.4.0",
+    "electron": "^1.4.4",
     "electron-devtools-installer": "^2.0.1",
-    "electron-rebuild": "^1.2.1",
-    "enzyme": "^2.4.1",
-    "eslint": "^3.7.1",
+    "electron-packager": "^8.1.0",
+    "electron-rebuild": "^1.3.0",
+    "enzyme": "^2.5.1",
+    "eslint": "^3.8.1",
     "eslint-config-airbnb": "^12.0.0",
-    "eslint-formatter-pretty": "^1.0.0",
+    "eslint-formatter-pretty": "^1.1.0",
     "eslint-import-resolver-webpack": "^0.6.0",
-    "eslint-loader": "^1.5.0",
-    "eslint-plugin-flowtype-errors": "^1.3.1",
-    "eslint-plugin-import": "^2.0.0",
-    "eslint-plugin-jsx-a11y": "^2.2.2",
-    "eslint-plugin-mocha": "^4.6.0",
-    "eslint-plugin-promise": "^2.0.1",
-    "eslint-plugin-react": "^6.3.0",
+    "eslint-loader": "^1.6.0",
+    "eslint-plugin-flowtype-errors": "^1.4.1",
+    "eslint-plugin-import": "^2.0.1",
+    "eslint-plugin-jsx-a11y": "^2.2.3",
+    "eslint-plugin-promise": "^3.3.0",
+    "eslint-plugin-mocha": "^4.7.0",
+    "eslint-plugin-react": "^6.4.1",
     "express": "^4.14.0",
     "extract-text-webpack-plugin": "^1.0.1",
     "fbjs-scripts": "^0.7.1",
-    "html-webpack-plugin": "^2.22.0",
-    "jsdom": "^9.6.0",
+    "jsdom": "^9.8.0",
     "json-loader": "^0.5.4",
     "minimist": "^1.2.0",
-    "mocha": "^3.1.0",
+    "mocha": "^3.1.2",
     "node-libs-browser": "^1.0.0",
     "postcss": "^5.2.4",
     "react-addons-test-utils": "^15.3.2",
@@ -138,21 +137,23 @@
     "style-loader": "^0.13.1",
     "tcomb": "^3.2.15",
     "webpack": "^1.13.2",
-    "webpack-dev-middleware": "^1.8.3",
-    "webpack-hot-middleware": "^2.12.2",
-    "webpack-merge": "^0.14.1",
+    "webpack-dev-middleware": "^1.8.4",
+    "webpack-hot-middleware": "^2.13.0",
+    "webpack-merge": "^0.15.0",
     "webpack-validator": "^2.2.9"
   },
   "dependencies": {
     "electron-debug": "^1.0.1",
+    "font-awesome": "^4.6.3",
+    "postcss": "^5.2.5",
     "react": "^15.3.2",
     "react-dom": "^15.3.2",
     "react-redux": "^4.4.5",
-    "react-router": "^2.8.1",
+    "react-router": "^3.0.0",
     "react-router-redux": "^4.0.6",
     "redux": "^3.6.0",
     "redux-thunk": "^2.1.0",
-    "source-map-support": "^0.4.3"
+    "source-map-support": "^0.4.5"
   },
   "devEngines": {
     "node": "4.x || 5.x || 6.x",