Merge branch 'master' into release/v1.1.0

gulpfile.js

@@ -180,7 +180,6 @@ function makePackage(platform, arch, callback) {
   var packageJson = require('./src/package.json');
   packager({
     dir: './dist',
-    name: packageJson.name,
     platform: platform,
     arch: arch,
     version: require('./package.json').devDependencies['electron-prebuilt'],
@@ -188,14 +187,14 @@ function makePackage(platform, arch, callback) {
     prune: true,
     overwrite: true,
     "app-version": packageJson.version,
-    icon: 'resources/electron-mattermost',
+    icon: 'resources/appicon',
     "version-string": {
       CompanyName: packageJson.author,
       LegalCopyright: 'Copyright (c) 2015 ' + packageJson.author,
-      FileDescription: packageJson.name,
-      OriginalFilename: packageJson.name + '.exe',
+      FileDescription: packageJson.description,
+      OriginalFilename: packageJson.productName + '.exe',
       ProductVersion: packageJson.version,
-      ProductName: packageJson.name,
+      ProductName: packageJson.productName,
       InternalName: packageJson.name
     }
   }, function(err, appPath) {
@@ -232,6 +231,7 @@ gulp.task('sync-meta', function() {
   var appPackageJson = require('./src/package.json');
   var packageJson = require('./package.json');
   appPackageJson.name = packageJson.name;
+  appPackageJson.productName = packageJson.productName;
   appPackageJson.version = packageJson.version;
   appPackageJson.description = packageJson.description;
   appPackageJson.author = packageJson.author;