Merge branch 'master' into sm-windows-file-icon

exports/atom.js

@@ -27,7 +27,12 @@ const atomExport = {
 
 // Shell integration is required by both Squirrel and Settings-View
 if (process.platform === 'win32') {
-  atomExport.WinShell = require('../src/main-process/win-shell')
+  Object.defineProperty(atomExport, 'WinShell', {
+    enumerable: true,
+    get () {
+      return require('../src/main-process/win-shell')
+    }
+  })
 }
 
 // The following classes can't be used from a Task handler and should therefore

src/color.js

@@ -85,6 +85,10 @@ export default class Color {
     return `rgba(${this.red}, ${this.green}, ${this.blue}, ${this.alpha})`
   }
 
+  toJSON () {
+    return this.alpha === 1 ? this.toHexString() : this.toRGBAString()
+  }
+
   isEqual (color) {
     if (this === color) {
       return true

src/main-process/win-shell.coffee

@@ -43,6 +43,7 @@ exports.appName = appName
 exports.fileHandler = new ShellOption("\\Software\\Classes\\Applications\\#{exeName}",
   [
     {key: 'shell\\open\\command', name: '', value: "#{appPath} \"%1\""},
+    {key: 'shell\\open', name: 'FriendlyAppName', value: "#{appName}"},
     {key: 'DefaultIcon', name: '', value: "#{fileIconPath}"}
   ]
 )