Merge branch 'master' of github.com:c9/newclient into fix/rc1

Conflicts:
	.c9/project.settings

package.json

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