Merge remote-tracking branch 'origin/master' into improve-odev

Conflicts:
	plugins/c9.proxy/proxy.cfg.ejs

package.json

@@ -87,7 +87,7 @@
         "c9.ide.dialog.wizard": "#7667ec79a8",
         "c9.ide.fontawesome": "#781602c5d8",
         "c9.ide.format": "#f51451ac57",
-        "c9.ide.help.support": "#6bcfa8ceff",
+        "c9.ide.help.support": "#61f5a81d8c",
         "c9.ide.imgeditor": "#ed89162aa7",
         "c9.ide.immediate": "#6845a93705",
         "c9.ide.installer": "#c36540bd61",