Merge branch 'master' into dev

package.json

@@ -1,14 +1,14 @@
 {
   "name": "mattermost-desktop",
   "productName": "Mattermost",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Mattermost Desktop application for Windows, Mac and Linux",
   "main": "main.js",
   "author": {
     "name": "Yuya Ochiai",
     "email": "yuya0321@gmail.com"
   },
-  "license": "MIT",
+  "license": "Apache-2.0",
   "engines": {
     "node": ">=4.2.0"
   },
@@ -25,7 +25,8 @@
     "package:osx": "gulp package:osx",
     "package:linux": "gulp build && build --platform linux --arch all -d deb",
     "package:all": "gulp package:all",
-    "prettify": "gulp prettify"
+    "prettify": "gulp prettify",
+    "installer": "node ./script/installer.js"
   },
   "devDependencies": {
     "babel-core": "^6.7.5",
@@ -34,10 +35,12 @@
     "chai": "^3.5.0",
     "chai-as-promised": "^5.3.0",
     "del": "^2.2.0",
-    "electron-builder": "^3.11.0",
+    "electron-builder": "3.20.0",
     "electron-connect": "^0.3.7",
     "electron-packager": "^7.0.1",
     "electron-prebuilt": "1.0.2",
+    "electron-squirrel-startup": "^1.0.0",
+    "electron-winstaller": "^2.2.0",
     "esformatter": "^0.9.3",
     "esformatter-jsx": "^5.0.0",
     "gulp": "^3.9.0",
@@ -49,6 +52,7 @@
     "mocha": "^2.3.4",
     "mocha-circleci-reporter": "0.0.1",
     "spectron": "~3.0.0",
+    "rimraf": "^2.5.2",
     "style-loader": "^0.13.0",
     "through2": "^2.0.1",
     "vinyl-named": "^1.1.0",
@@ -56,6 +60,8 @@
     "webpack-stream": "^3.1.0"
   },
   "build": {
+    "app-bundle-id": "com.mattermost.desktop",
+    "app-category-type": "public.app-category.productivity",
     "linux": {
       "synopsis": "Mattermost Desktop"
     }