Merge branch 'master' of github.com:c9/newclient into sdk-market

Conflicts:
	plugins/c9.ide.performancestats/stats.less

configs/client-default.js

@@ -515,6 +515,7 @@ module.exports = function(options) {
         },
         "plugins/c9.ide.panels/panel",
         "plugins/c9.ide.panels/area",
+        "plugins/c9.ide.processlist/processlist",
         
         // Installer
         {

package.json

@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#63c3c021e3",
+        "c9.ide.installer": "#f745122dc9",
         "c9.ide.mount": "#32e79866ee",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",
@@ -95,7 +95,7 @@
         "c9.ide.readonly": "#f6f07bbe42",
         "c9.ide.recentfiles": "#7c099abf40",
         "c9.ide.remote": "#cd45e81d2f",
-        "c9.ide.processlist": "#bc11818bb5",
+        "c9.ide.processlist": "#9fd4807dd9",
         "c9.ide.run": "#71c5562e42",
         "c9.ide.run.build": "#ad45874c88",
         "c9.ide.run.debug.xdebug": "#b91d23f48b",