Merge remote-tracking branch 'origin/master' into fix-issue-9186

Conflicts:
	npm-shrinkwrap.json
	package.json

package.json

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

plugins/c9.fs/fs.cache.xml.js

@@ -633,7 +633,7 @@ define(function(require, exports, module) {
                     model.collapse(all[i]);
             }
             model.projectDir = {
-                label: c9.projectName, 
+                label: options.rootLabel || c9.projectName,
                 isFolder: true,
                 path: "/",
                 status: "pending",