Merge branch 'guide' of github.com:c9/newclient into guide

Conflicts:
	plugins/c9.ide.guide/guide.js

package.json

@@ -118,6 +118,6 @@
         "c9.ide.undo": "#b028bcb4d5",
         "c9.ide.upload": "#0bd010d3dc",
         "c9.ide.welcome": "#5b86c44e92",
-        "c9.ide.guide": "#427e410e16"
+        "c9.ide.guide": "#a4b2f564b0"
     }
 }