Merge branch 'master' of github.com:c9/newclient into merge-account

package.json

@@ -67,7 +67,7 @@
         "c9.ide.language.javascript.tern": "#2b0bb024da",
         "c9.ide.language.javascript.infer": "#cfec494a3c",
         "c9.ide.language.jsonalyzer": "#c253f093a0",
-        "c9.ide.collab": "#f0e96dd2cf",
+        "c9.ide.collab": "#47a290ae37",
         "c9.ide.local": "#a9703b630c",
         "c9.ide.find": "#6cc6d3379d",
         "c9.ide.find.infiles": "#72582de3cd",