Merge remote-tracking branch 'upstream/skynet' into SEARCH-116-GCM

# Conflicts:
#	package.json

js/main.js

@@ -54,10 +54,22 @@ if (!isDevEnv && shouldQuit) {
     app.quit();
 }
 
-var symphonyAutoLauncher = new AutoLaunch({
-    name: 'Symphony',
-    path: process.execPath,
-});
+let symphonyAutoLauncher;
+
+if (isMac) {
+    symphonyAutoLauncher = new AutoLaunch({
+        name: 'Symphony',
+        mac: {
+            useLaunchAgent: true,
+        },
+        path: process.execPath,
+    });
+} else {
+    symphonyAutoLauncher = new AutoLaunch({
+        name: 'Symphony',
+        path: process.execPath,
+    });
+}
 
 /**
  * This is for demo purpose only
@@ -142,7 +154,12 @@ function setupThenOpenMainWindow() {
 
     // allows mac installer to overwrite user config
     if (isMac && hasInstallFlag) {
+        // This value is being sent from post install script
+        // as the app is launched as a root user we don't get
+        // access to the config file
+        let launchOnStartup = process.argv[3];
         updateUserConfigMac()
+            .then(setStartup(launchOnStartup))
             .then(app.quit)
             .catch(app.quit);
         return;