Merge remote-tracking branch 'origin/master' into user-domain

Conflicts:
	npm-shrinkwrap.json
	plugins/c9.proxy/proxy.cfg.ejs

package.json

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