Merge remote-tracking branch 'origin/master' into smf-plugins

Conflicts:
	npm-shrinkwrap.json

configs/client-default.js

@@ -390,20 +390,6 @@ module.exports = function(options) {
         "plugins/c9.ide.run.debug.xdebug/xdebug",
         "plugins/c9.ide.run.debug/debuggers/gdb/gdbdebugger",
         
-        // Test
-        "plugins/c9.ide.test/test",
-        "plugins/c9.ide.test/testpanel",
-        "plugins/c9.ide.test/testrunner",
-        {
-            packagePath: "plugins/c9.ide.test/all",
-            staticPrefix: staticPrefix + "/plugins/c9.ide.test"
-        },
-        "plugins/c9.ide.test/results",
-        "plugins/c9.ide.test/coverage",
-        "plugins/c9.ide.test/coverageview",
-        
-        "plugins/c9.ide.test.mocha/mocha",
-        
         // Console
         {
             packagePath: "plugins/c9.ide.terminal/terminal",
@@ -719,6 +705,24 @@ module.exports = function(options) {
         },
     ];
     
+    if (!options.sdk) {
+        plugins.push(
+            // Test
+            "plugins/c9.ide.test/test",
+            "plugins/c9.ide.test/testpanel",
+            "plugins/c9.ide.test/testrunner",
+            {
+                packagePath: "plugins/c9.ide.test/all",
+                staticPrefix: staticPrefix + "/plugins/c9.ide.test"
+            },
+            "plugins/c9.ide.test/results",
+            "plugins/c9.ide.test/coverage",
+            "plugins/c9.ide.test/coverageview",
+            
+            "plugins/c9.ide.test.mocha/mocha"
+        );
+    }
+
     if (options.standalone || options.local) {
         plugins.push(
             "plugins/c9.ide.scm/status",

package.json

@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.0.2592",
+    "version": "3.0.2598",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",