Merge remote-tracking branch 'origin/master' into salesforce-language

Conflicts:
	plugins/c9.fs/mock/plugins/c9.dummy/architect_test_dummy.js

package.json

@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.0.2476",
+    "version": "3.0.2487",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",
@@ -56,22 +56,22 @@
     ],
     "c9plugins": {
         "c9.ide.language": "#6543edc935",
-        "c9.ide.language.css": "#ef8a28943e",
+        "c9.ide.language.css": "#a649f2a710",
         "c9.ide.language.generic": "#77d43cfaf0",
-        "c9.ide.language.html": "#99efa2853f",
+        "c9.ide.language.html": "#0f4078c187",
         "c9.ide.language.html.diff": "#24f3608d26",
         "c9.ide.language.javascript": "#ad757514b4",
         "c9.ide.language.javascript.immediate": "#0535804ada",
         "c9.ide.language.javascript.eslint": "#08e0af061f",
-        "c9.ide.language.javascript.tern": "#818f60f0ac",
-        "c9.ide.language.javascript.infer": "#4c9a4282ff",
-        "c9.ide.language.jsonalyzer": "#8d685380a2",
-        "c9.ide.collab": "#b49eda3791",
+        "c9.ide.language.javascript.tern": "#2c5b761312",
+        "c9.ide.language.javascript.infer": "#8478e3c702",
+        "c9.ide.language.jsonalyzer": "#e0d94eda4f",
+        "c9.ide.collab": "#c74666f592",
         "c9.ide.local": "#a9703b630c",
         "c9.ide.find": "#e073bf251a",
         "c9.ide.find.infiles": "#c132ad243c",
         "c9.ide.find.replace": "#44772dd796",
-        "c9.ide.run.debug": "#25a59d1269",
+        "c9.ide.run.debug": "#3e9ce59b1b",
         "c9.automate": "#47e2c429c9",
         "c9.ide.ace.emmet": "#6dc4585e02",
         "c9.ide.ace.gotoline": "#a8ff07c8f4",
@@ -91,7 +91,7 @@
         "c9.ide.immediate": "#6845a93705",
         "c9.ide.installer": "#be8d9aa07c",
         "c9.ide.mount": "#816dbe987b",
-        "c9.ide.navigate": "#f358997d93",
+        "c9.ide.navigate": "#6e4efa5b25",
         "c9.ide.newresource": "#f1f0624768",
         "c9.ide.openfiles": "#28a4f5af16",
         "c9.ide.preview": "#a75e218d3e",
@@ -104,7 +104,7 @@
         "c9.ide.processlist": "#bc11818bb5",
         "c9.ide.run": "#db7ca8eb81",
         "c9.ide.run.build": "#ad45874c88",
-        "c9.ide.run.debug.xdebug": "#3b1520f83d",
+        "c9.ide.run.debug.xdebug": "#61dcbd0180",
         "c9.ide.save": "#cc613b6ead",
         "c9.ide.scm": "#f3847917b8",
         "c9.ide.terminal.monitor": "#b52a3f2144",

plugins/c9.cli.publish/publish_test.js

@@ -1,7 +1,7 @@
 /*global describe it before after beforeEach afterEach define*/
 "use strict";
 "use server";
-"use mocha";
+
 "use blacklist";
 
 require("c9/inline-mocha")(module);

plugins/c9.ide.plugins/mock/c9.ide.example3/plugin_test.js

@@ -1,5 +1,5 @@
 "use client";
-"use mocha";
+
 
 define(function(require, exports, module) {
     main.consumes = ["plugin.test", "myplugin"];

plugins/c9.ide.plugins/templates/plugin.default/plugin_test.js

@@ -1,5 +1,5 @@
 "use client";
-"use mocha";
+
 
 define(function(require, exports, module) {
     main.consumes = ["plugin.test", "myplugin"];

plugins/c9.ide.plugins/templates/plugin.simple/plugin_test.js

@@ -1,5 +1,5 @@
 "use client";
-"use mocha";
+
 
 define(function(require, exports, module) {
     main.consumes = ["plugin.test", "myplugin"];

plugins/c9.ide.terminal/predict_echo_test.js

@@ -1,7 +1,7 @@
 /*global describe it before beforeEach after bar =*/
 
 "use client";
-"use mocha";
+
 
 require(["lib/architect/architect", "lib/chai/chai", "/vfs-root", "ace/test/assertions"], function (architect, chai, baseProc) {
     var expect = chai.expect;

plugins/c9.static/build_test.js

@@ -3,7 +3,7 @@
 "use strict";
 
 "use server";
-"use mocha";
+
 
 require("c9/inline-mocha")(module);
 

plugins/c9.vfs.server/download_test.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 "use strict";
 "use server";
-"use mocha";
+
 
 require("c9/inline-mocha")(module);
 if (typeof define === "undefined") {