Merge branch 'master' of github.com:c9/newclient into feature/a-b-optimizely

Conflicts:
	plugins/c9.profile.server/render.js

configs/standalone.js

@@ -144,6 +144,7 @@ module.exports = function(config, optimist) {
                 "c9.vfs.client": true,
                 "c9.cli.bridge": true,
                 "c9.nodeapi": true,
+                "c9.experiment": true,
                 "saucelabs.preview": true
             }
         },
@@ -174,6 +175,7 @@ module.exports = function(config, optimist) {
         "./c9.vfs.server/filelist",
         "./c9.vfs.server/statics",
         "./c9.metrics/mock_metrics",
+        "./c9.experiment/mock_experiment",
         {
             packagePath: "./c9.vfs.server/vfs.connect.standalone",
             workspaceDir: baseProc,