From cf8bb7028393b7f991072bcab310619e8db5cab2 Mon Sep 17 00:00:00 2001
From: Nikolai Onken <nikolai@c9.io>
Date: Wed, 22 Apr 2015 10:59:19 +0000
Subject: [PATCH 1/2] Merge branch 'master' of github.com:c9/newclient into
 feature/a-b-optimizely

Conflicts:
	plugins/c9.profile.server/render.js
---
 configs/standalone.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configs/standalone.js b/configs/standalone.js
index c301c96c..2d88f0a0 100644
--- a/configs/standalone.js
+++ b/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,

From 8efde64315fb4ba2c2d5265aed7a4e08e4afbc53 Mon Sep 17 00:00:00 2001
From: Nikolai Onken <nikolai@c9.io>
Date: Wed, 22 Apr 2015 11:56:21 +0000
Subject: [PATCH 2/2] Rename experiment

---
 configs/standalone.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/standalone.js b/configs/standalone.js
index 2d88f0a0..ba96b924 100644
--- a/configs/standalone.js
+++ b/configs/standalone.js
@@ -144,7 +144,7 @@ module.exports = function(config, optimist) {
                 "c9.vfs.client": true,
                 "c9.cli.bridge": true,
                 "c9.nodeapi": true,
-                "c9.experiment": true,
+                "c9.ide.experiment": true,
                 "saucelabs.preview": true
             }
         },
@@ -175,7 +175,7 @@ module.exports = function(config, optimist) {
         "./c9.vfs.server/filelist",
         "./c9.vfs.server/statics",
         "./c9.metrics/mock_metrics",
-        "./c9.experiment/mock_experiment",
+        "./c9.ide.experiment/mock_experiment",
         {
             packagePath: "./c9.vfs.server/vfs.connect.standalone",
             workspaceDir: baseProc,