Merge remote-tracking branch 'origin/master' into gui-fixes

package.json

@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.3075",
+    "version": "3.1.3079",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",
@@ -120,7 +120,7 @@
         "c9.ide.threewaymerge": "#229382aa0b",
         "c9.ide.undo": "#b028bcb4d5",
         "c9.ide.upload": "#e4351f5a2b",
-        "c9.ide.welcome": "#5b86c44e92",
+        "c9.ide.welcome": "#7b75aefc28",
         "c9.ide.guide": "#19f6087429"
     }
 }

plugins/c9.static/unpacked_helper.js

@@ -1,39 +0,0 @@
-/**
- * unpacked_helper speeds up the unpacked version of Cloud9
- * by using more parallel connections and avoiding
- * subsubdomains on dogfooding (e.g., ide.dev-lennartcl.c9.io, where
- * Chrome doesn't support any caching).
- */
-"use strict";
-
-plugin.consumes = [
-    "db", "connect.static"
-];
-plugin.provides = [
-    "unpacked_helper"
-];
-
-module.exports = plugin;
-
-function plugin(options, imports, register) {
-    var connectStatic = imports["connect.static"];
-    var assert = require("assert");
-    var baseUrl = options.baseUrl;
-    var ideBaseUrl = options.ideBaseUrl;
-    assert(baseUrl, "baseUrl must be set");
-    assert(ideBaseUrl, "ideBaseUrl must be set");
-    
-    var balancers = [
-        baseUrl + "/_unp",
-        baseUrl + ":8080/_unp",
-        baseUrl + ":8081/_unp",
-        baseUrl + ":8082/_unp",
-    ];
-    
-    connectStatic.getRequireJsConfig().baseUrlLoadBalancers = balancers;
-    assert(connectStatic.getRequireJsConfig().baseUrlLoadBalancers);
-    
-    register(null, {
-        "unpacked_helper": {}
-    });
-}