From 667fd57cab4a5f544052882cb7dd376415066b77 Mon Sep 17 00:00:00 2001
From: Kareem Zidane <kareem.mes@gmail.com>
Date: Tue, 24 May 2016 12:58:18 +0200
Subject: [PATCH 001/303] changes on-hover bg color for Run and Preview

the on-hover background color for Run/Debug and Preview buttons is
brighter than it should (#E6E6E6) in Cloud9 Night theme. it doesn't
match that of the menus.

this changes the value of the background CSS property, of the relevant
classes, to the matching color (#303130).
---
 plugins/c9.ide.layout.classic/themes/flat-dark.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/c9.ide.layout.classic/themes/flat-dark.less b/plugins/c9.ide.layout.classic/themes/flat-dark.less
index be6a89e9..8902aa4f 100644
--- a/plugins/c9.ide.layout.classic/themes/flat-dark.less
+++ b/plugins/c9.ide.layout.classic/themes/flat-dark.less
@@ -1,7 +1,7 @@
 @import "plugins/c9.ide.layout.classic/themes/flat-light.less";
 
 .bartools .c9-toolbarbutton-glossyOver{
-    background: #E6E6E6;
+    background: #303130;
 }
 
 .bartools .c9-toolbarbutton-glossymenuDown{
@@ -221,4 +221,4 @@
 
 @media print, (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 1.25dppx) {
     
-}
\ No newline at end of file
+}

From 3806d998906de0b91c74ecfd7c23acb3efb58a1b Mon Sep 17 00:00:00 2001
From: Chris Brown <cbrown@fico.com>
Date: Fri, 13 May 2016 10:35:39 +0100
Subject: [PATCH 002/303] Fix: check that object.properties exists before
 testing its length

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f4560a05..63a701b5 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
         "c9.ide.format": "#5ec97fb083",
         "c9.ide.help.support": "#932fbb3743",
         "c9.ide.imgeditor": "#612e75ef4f",
-        "c9.ide.immediate": "#0e0c18066c",
+        "c9.ide.immediate": "#76c8e3213a",
         "c9.ide.installer": "#b2e4ba0a92",
         "c9.ide.language.python": "#aff0772c78",
         "c9.ide.language.go": "#6ce1c7a7ef",

From d8631c216cc8ed338a8f987b2bbc30cb3905fa00 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Fri, 13 May 2016 19:12:25 +0000
Subject: [PATCH 003/303] VFS Fix collab code reverting for unsaved files

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 583ddad4..4af7226b 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     ],
     "c9plugins": {
         "c9.ide.language": "#79bcb2fe06",
+        "c9.ide.language.core": "#undefined",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#3949510863",
         "c9.ide.language.html": "#22fdc74869",
@@ -70,7 +71,7 @@
         "c9.ide.language.javascript.infer": "#18acb93a3a",
         "c9.ide.language.jsonalyzer": "#d8183d84b4",
         "c9.ide.language.codeintel": "#fc867feec4",
-        "c9.ide.collab": "#b584db93f8",
+        "c9.ide.collab": "#d513ede176",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c0a13737ef",

From 5eb44439d3ea8657408c269120eda9528cea873a Mon Sep 17 00:00:00 2001
From: Dan Armendariz <danallan@cs.harvard.edu>
Date: Fri, 13 May 2016 23:01:57 +0000
Subject: [PATCH 004/303] modify frame API to include thread id

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 63a701b5..9d2307fd 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#bd34c29373",
         "c9.ide.find.replace": "#810ebf8bfb",
-        "c9.ide.run.debug": "#94a48978bf",
+        "c9.ide.run.debug": "#317feee072",
         "c9.automate": "#47e2c429c9",
         "c9.ide.ace.emmet": "#6dc4585e02",
         "c9.ide.ace.gotoline": "#a8ff07c8f4",

From c487213ce74d63e0678481349687bae8053abf7a Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Mon, 16 May 2016 13:36:24 +0000
Subject: [PATCH 005/303] Use ctime isntead of mtime

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2f218497..bc7bfdf3 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "c9.ide.language.javascript.infer": "#18acb93a3a",
         "c9.ide.language.jsonalyzer": "#d8183d84b4",
         "c9.ide.language.codeintel": "#fc867feec4",
-        "c9.ide.collab": "#366f884c53",
+        "c9.ide.collab": "#d8503004e4",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c0a13737ef",

From 3ee07ac9a14e73a1ff5c1a5733874828b1b38e3f Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Tue, 17 May 2016 08:20:58 +0000
Subject: [PATCH 006/303] Work around missing pos

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5fd18f60..87737228 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#79bcb2fe06",
+        "c9.ide.language": "#b8f73a9da1",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#3949510863",
         "c9.ide.language.html": "#22fdc74869",

From fd96fc8f0143f724362363fa0629e5b558641b26 Mon Sep 17 00:00:00 2001
From: Chris Brown <cbrown@fico.com>
Date: Tue, 17 May 2016 14:40:29 +0100
Subject: [PATCH 007/303] When downloading several files or folders, name the
 archive 'item1[+n].zip', and ensure that filenames are encoded correctly

---
 package.json                        |  1 +
 plugins/c9.ide.download/download.js | 14 ++++++++++----
 plugins/c9.vfs.client/vfs_client.js |  4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 4317d547..157706fd 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     ],
     "c9plugins": {
         "c9.ide.language": "#79bcb2fe06",
+        "c9.ide.language.core": "#undefined",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#3949510863",
         "c9.ide.language.html": "#22fdc74869",
diff --git a/plugins/c9.ide.download/download.js b/plugins/c9.ide.download/download.js
index dd6a585f..ab8e5280 100644
--- a/plugins/c9.ide.download/download.js
+++ b/plugins/c9.ide.download/download.js
@@ -91,24 +91,30 @@ define(function(require, exports, module) {
         }
 
         function downloadProject() {
-            vfs.download("/", info.getWorkspace().name + getArchiveFileExtension());
+            vfs.download("/", makeArchiveFilename(info.getWorkspace().name));
         }
 
         function downloadPaths(paths) {
-            vfs.download(paths, info.getWorkspace().name + getArchiveFileExtension());
+            var lastPart = paths[0].match(/([^\/]*)\/?$/)[1];
+            var filename = lastPart ? (lastPart + "[+" + (paths.length - 1) + "]") : info.getWorkspace().name;
+            vfs.download(paths, makeArchiveFilename(filename));
         }
 
         function downloadFolder(path) {
             var withTrailingSlash = path.replace(/\/*$/, "/");
             var parts = withTrailingSlash.split("/");
-            var lastPart = parts[parts.length - 2];
-            vfs.download(withTrailingSlash, lastPart + getArchiveFileExtension());
+            var folderName = parts[parts.length - 2];
+            vfs.download(withTrailingSlash, makeArchiveFilename(folderName));
         }
 
         function downloadFile(path) {
             vfs.download(path.replace(/\/*$/, ""), null, true);
         }
 
+        function makeArchiveFilename(filename) {
+            return filename + getArchiveFileExtension();
+        }
+
         function getArchiveFileExtension() {
             var downloadFilesAs = settings.get(SETTING_PATH);
             if (downloadFilesAs === 'auto' || !downloadFilesAs) {
diff --git a/plugins/c9.vfs.client/vfs_client.js b/plugins/c9.vfs.client/vfs_client.js
index 0fd09d42..44f3b1a1 100644
--- a/plugins/c9.vfs.client/vfs_client.js
+++ b/plugins/c9.vfs.client/vfs_client.js
@@ -193,12 +193,12 @@ define(function(require, exports, module) {
                 extraPaths = path;
                 path = path[0];
                 extraPaths = "," + extraPaths.map(function(p) {
-                    return p[0] == path[0] && p != path ? escape(p) : "";
+                    return p[0] == path[0] && p != path ? encodeURI(p) : "";
                 }).filter(Boolean).join(",");
             }
             window.open(vfsUrl(path) + extraPaths
                 + "?download" 
-                + (filename ? "=" + escape(filename) : "")
+                + (filename ? "=" + encodeURIComponent(filename) : "")
                 + (isfile ? "&isfile=1" : ""));
         }
 

From 31ad443da504a5a51d756553a23c6b3de644236b Mon Sep 17 00:00:00 2001
From: Chris Brown <cbrown@fico.com>
Date: Tue, 17 May 2016 15:25:13 +0100
Subject: [PATCH 008/303] Another filename encoding fix

---
 plugins/c9.vfs.server/download.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/c9.vfs.server/download.js b/plugins/c9.vfs.server/download.js
index b1dbea6f..ec26e2ca 100644
--- a/plugins/c9.vfs.server/download.js
+++ b/plugins/c9.vfs.server/download.js
@@ -113,10 +113,8 @@ define(function(require, exports, module) {
                 paths.forEach(function(path) {
                     if (!path) return;
                     path = Path.relative(cwd, path);
-                    // tar misinterprets the Windows path separator as an escape sequence, so use forward slash.
-                    if (Path.sep === '\\') {
-                        path = path.replace(/\\/g, '/');
-                    }
+                    // Single quote the path to escape unusual characters, and manually escape single quotes.
+                    path = "'" + path.replace(/'/, "'\\''") + "'";
                     args.push(path);
                 });
 

From 0683fb0711e80f255ab7d665f2b86066353c8795 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Tue, 17 May 2016 20:46:36 +0000
Subject: [PATCH 009/303] Rename tabs to tabManager as that's what it is

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bc7bfdf3..637cbea7 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "c9.ide.language.javascript.infer": "#18acb93a3a",
         "c9.ide.language.jsonalyzer": "#d8183d84b4",
         "c9.ide.language.codeintel": "#fc867feec4",
-        "c9.ide.collab": "#d8503004e4",
+        "c9.ide.collab": "#1729d31b92",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c0a13737ef",

From 77338d54e5a673fa3b0990f38388f2206e6dfb58 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Tue, 17 May 2016 20:46:42 +0000
Subject: [PATCH 010/303] Instead of automerging from disk, always prompt user
 about disk being different and allow them to apply the changes if they like

---
 package.json                  |  2 +-
 plugins/c9.ide.watcher/gui.js | 41 ++++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 637cbea7..8f307533 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "c9.ide.language.javascript.infer": "#18acb93a3a",
         "c9.ide.language.jsonalyzer": "#d8183d84b4",
         "c9.ide.language.codeintel": "#fc867feec4",
-        "c9.ide.collab": "#1729d31b92",
+        "c9.ide.collab": "#1ea29be441",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c0a13737ef",
diff --git a/plugins/c9.ide.watcher/gui.js b/plugins/c9.ide.watcher/gui.js
index e1330ca4..54e577a9 100644
--- a/plugins/c9.ide.watcher/gui.js
+++ b/plugins/c9.ide.watcher/gui.js
@@ -1,7 +1,7 @@
 define(function(require, exports, module) {
     main.consumes = [
         "Plugin", "fs", "settings", "preferences", "watcher", "tabManager", 
-        "save", "dialog.question", "dialog.filechange", "threewaymerge"
+        "save", "dialog.question", "dialog.filechange", "threewaymerge", "collab"
     ];
     main.provides = ["watcher.gui"];
     return main;
@@ -17,6 +17,7 @@ define(function(require, exports, module) {
         var question = imports["dialog.question"];
         var filechange = imports["dialog.filechange"];
         var threeWayMerge = imports.threewaymerge.merge;
+        var collab = imports.collab;
         
         var collabEnabled = options.collab;
 
@@ -119,33 +120,33 @@ define(function(require, exports, module) {
     
             // Hook watcher events
             
-            // Update a file
+            // A change event sent from the watcher plugin
             watcher.on("change", function(e) {
                 var tab = tabManager.findTab(e.path);
                 if (tab) {
-                    // If collab picks this up and handles the change it will return false 
-                    if (emit("docChange", {tab: tab}) === false)
-                        return;
+                    if (collabEnabled && tab.editorType == "ace") {
+                        /* If the lastChange (added by collab) was greater than 1 second ago set up a watch 
+                            To ensure that collab makes this change, if not report an error. The lastChange
+                            check is to avoid a race condition if collab updates before this function runs */
+                        if (!tab.meta.$lastCollabChange || tab.meta.$lastCollabChange < (Date.now() - 1000)) {
+                            if (tab.meta.$collabChangeRegistered) {
+                                clearTimeout(tab.meta.$collabChangeRegistered);
+                            }
+                        }
+                        
+                        return false;
+                    }
                     
                     addChangedTab(tab, e.type === "change");
                 }
             });
             
-            // Directory watcher is not needed if the normal watcher works
-            // watcher.on("directory", function(e) {
-            //     var base = e.path;
-            //     var files = e.files;
-            // 
-            //     // Rename all tabs
-            //     tabManager.getTabs().forEach(function(tab) {
-            //         if (tab.path && tab.path.indexOf(base) == 0) {
-            //             // If the file is gone, lets notify the user
-            //             if (files.indexOf(tab.path) == -1) {
-            //                 resolveFileDelete(tab);
-            //             }
-            //         }
-            //     });
-            // });
+            collab.on("change", function (e) {
+                var tab = tabManager.findTab(e.path);
+                if (tab) {
+                    addChangedTab(tab, e.type === "change");
+                }
+            });
             
             watcher.on("delete", function(e) {
                 var tab = tabManager.findTab(e.path);

From 599b813a94b11c7f838240703a584e90beac7424 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Tue, 17 May 2016 21:01:30 +0000
Subject: [PATCH 011/303] Remove getLatestRevision as we don't use it

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8f307533..7becf105 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "c9.ide.language.javascript.infer": "#18acb93a3a",
         "c9.ide.language.jsonalyzer": "#d8183d84b4",
         "c9.ide.language.codeintel": "#fc867feec4",
-        "c9.ide.collab": "#1ea29be441",
+        "c9.ide.collab": "#d6dc9b0632",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c0a13737ef",

From ad73b79bdf4f4eceab9d6889e9ced6ea1c125182 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Tue, 17 May 2016 23:02:30 +0000
Subject: [PATCH 012/303] Revert "Remove getLatestRevision as we don't use it"

This reverts commit 599b813a94b11c7f838240703a584e90beac7424.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7becf105..54a03d44 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "c9.ide.language.javascript.infer": "#18acb93a3a",
         "c9.ide.language.jsonalyzer": "#d8183d84b4",
         "c9.ide.language.codeintel": "#fc867feec4",
-        "c9.ide.collab": "#d6dc9b0632",
+        "c9.ide.collab": "#52b1cd4504",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c0a13737ef",

From 6dacc6240de98464efeba3f833d2153a54f0547a Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Tue, 17 May 2016 23:09:18 +0000
Subject: [PATCH 013/303] Revert "Instead of automerging from disk, always
 prompt user about disk being different and allow them to apply the changes if
 they like"

This reverts commit 77338d54e5a673fa3b0990f38388f2206e6dfb58.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 54a03d44..a739a931 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "c9.ide.language.javascript.infer": "#18acb93a3a",
         "c9.ide.language.jsonalyzer": "#d8183d84b4",
         "c9.ide.language.codeintel": "#fc867feec4",
-        "c9.ide.collab": "#52b1cd4504",
+        "c9.ide.collab": "#bea1b05bfd",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c0a13737ef",

From 7b08f19dd3617b34fd8774adb38944643fb52852 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Tue, 17 May 2016 23:33:39 +0000
Subject: [PATCH 014/303] If the latest revision was saved, use what's on disk.
 Otherwise prompt the user

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a739a931..aa1a8fc7 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "c9.ide.language.javascript.infer": "#18acb93a3a",
         "c9.ide.language.jsonalyzer": "#d8183d84b4",
         "c9.ide.language.codeintel": "#fc867feec4",
-        "c9.ide.collab": "#bea1b05bfd",
+        "c9.ide.collab": "#8c4a6d0137",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c0a13737ef",

From e9a86d802e81f86bfac317986ab77c0334a2e6f0 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Wed, 18 May 2016 01:16:18 +0000
Subject: [PATCH 015/303] Fixed bug with change icon not showing when the
 version in the IDE is different from on disk

---
 package.json                  | 2 +-
 plugins/c9.ide.watcher/gui.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index aa1a8fc7..8b3c9c36 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "c9.ide.language.javascript.infer": "#18acb93a3a",
         "c9.ide.language.jsonalyzer": "#d8183d84b4",
         "c9.ide.language.codeintel": "#fc867feec4",
-        "c9.ide.collab": "#8c4a6d0137",
+        "c9.ide.collab": "#2d22e02512",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c0a13737ef",
diff --git a/plugins/c9.ide.watcher/gui.js b/plugins/c9.ide.watcher/gui.js
index 54e577a9..ad2f61af 100644
--- a/plugins/c9.ide.watcher/gui.js
+++ b/plugins/c9.ide.watcher/gui.js
@@ -294,7 +294,7 @@ define(function(require, exports, module) {
         function automerge(tab, data) {
             if (!settings.getBool("user/general/@automerge"))
                 return false;
-                
+            console.log("Automerging old and new contents");
             return merge(tab, data);
         }
         

From 938895a0c9082ecac1e8d66cbd8d9b60b92d8cdf Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Wed, 18 May 2016 01:28:47 +0000
Subject: [PATCH 016/303] Only save out document when it's been synced to the
 DB

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8b3c9c36..c6584b2e 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "c9.ide.language.javascript.infer": "#18acb93a3a",
         "c9.ide.language.jsonalyzer": "#d8183d84b4",
         "c9.ide.language.codeintel": "#fc867feec4",
-        "c9.ide.collab": "#2d22e02512",
+        "c9.ide.collab": "#85ce41adac",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c0a13737ef",

From 814f11407a915115d2e17d87db7e3997137f8b76 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Wed, 25 May 2016 17:03:42 +0000
Subject: [PATCH 017/303] Code cleanup

---
 package.json                  | 2 +-
 plugins/c9.ide.watcher/gui.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 417363a6..c37023d0 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "c9.ide.language.javascript.infer": "#18acb93a3a",
         "c9.ide.language.jsonalyzer": "#d8183d84b4",
         "c9.ide.language.codeintel": "#fc867feec4",
-        "c9.ide.collab": "#eda7de90a9",
+        "c9.ide.collab": "#9d2a0b0721",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c0a13737ef",
diff --git a/plugins/c9.ide.watcher/gui.js b/plugins/c9.ide.watcher/gui.js
index ad2f61af..7e1979e8 100644
--- a/plugins/c9.ide.watcher/gui.js
+++ b/plugins/c9.ide.watcher/gui.js
@@ -294,7 +294,6 @@ define(function(require, exports, module) {
         function automerge(tab, data) {
             if (!settings.getBool("user/general/@automerge"))
                 return false;
-            console.log("Automerging old and new contents");
             return merge(tab, data);
         }
         

From 078f7869e33022403810095d0827b57462ab203a Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Wed, 25 May 2016 17:12:11 +0000
Subject: [PATCH 018/303] Improving logs

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c37023d0..dcae40ac 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "c9.ide.language.javascript.infer": "#18acb93a3a",
         "c9.ide.language.jsonalyzer": "#d8183d84b4",
         "c9.ide.language.codeintel": "#fc867feec4",
-        "c9.ide.collab": "#9d2a0b0721",
+        "c9.ide.collab": "#4406800a74",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c0a13737ef",

From 9475e7df86ce13a1610a258a6d230844ed6a6b2b Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Wed, 25 May 2016 19:27:56 +0000
Subject: [PATCH 019/303] fix out of quota message for non admin users

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 073f8990..7ed9e36d 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
         "c9.ide.preview.browser": "#897177be7f",
         "c9.ide.preview.markdown": "#c3174d86e0",
         "c9.ide.pubsub": "#99b7289040",
-        "c9.ide.readonly": "#cfd951ec16",
+        "c9.ide.readonly": "#7421caab61",
         "c9.ide.recentfiles": "#7c099abf40",
         "c9.ide.remote": "#301d2ab519",
         "c9.ide.processlist": "#2b12cd1bdd",

From de38faaa74c6d16274d264da6feaff745f83662d Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sun, 29 May 2016 02:18:42 +0400
Subject: [PATCH 020/303] fix +13786 tab sometimes deletes character before

---
 node_modules/ace/lib/ace/editor.js                | 2 +-
 node_modules/ace/lib/ace/editor_text_edit_test.js | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/node_modules/ace/lib/ace/editor.js b/node_modules/ace/lib/ace/editor.js
index b130df22..8705fc49 100644
--- a/node_modules/ace/lib/ace/editor.js
+++ b/node_modules/ace/lib/ace/editor.js
@@ -1486,7 +1486,7 @@ var Editor = function(renderer, session) {
             var indentString = lang.stringRepeat(" ", count);
         } else {
             var count = column % size;
-            while (line[range.start.column] == " " && count) {
+            while (line[range.start.column - 1] == " " && count) {
                 range.start.column--;
                 count--;
             }
diff --git a/node_modules/ace/lib/ace/editor_text_edit_test.js b/node_modules/ace/lib/ace/editor_text_edit_test.js
index 77ec34ed..382b8518 100644
--- a/node_modules/ace/lib/ace/editor_text_edit_test.js
+++ b/node_modules/ace/lib/ace/editor_text_edit_test.js
@@ -124,6 +124,12 @@ module.exports = {
         var range = editor.getSelectionRange();
         assert.position(range.start, 1, 7);
         assert.position(range.end, 2, 7);
+        
+        session.setValue("   x");
+        session.setOption("useSoftTabs", false);
+        editor.selection.moveTo(0, 3);
+        editor.indent();
+        assert.equal("\tx", session.toString());
     },
 
     "test: indent selected lines" : function() {

From abd1240700768853711fe7c84285da729bda4406 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sun, 29 May 2016 02:27:35 +0400
Subject: [PATCH 021/303] fix +13929 Extra quote marks when a string contains $

---
 node_modules/ace/lib/ace/mode/behaviour/cstyle.js   | 2 ++
 node_modules/ace/lib/ace/mode/sh_highlight_rules.js | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/node_modules/ace/lib/ace/mode/behaviour/cstyle.js b/node_modules/ace/lib/ace/mode/behaviour/cstyle.js
index c0b2e478..01aac37c 100644
--- a/node_modules/ace/lib/ace/mode/behaviour/cstyle.js
+++ b/node_modules/ace/lib/ace/mode/behaviour/cstyle.js
@@ -277,6 +277,8 @@ var CstyleBehaviour = function() {
                 var pair;
                 if (rightChar == quote) {
                     pair = stringBefore !== stringAfter;
+                    if (pair && /string\.end/.test(rightToken.type))
+                        pair = false;
                 } else {
                     if (stringBefore && !stringAfter)
                         return null; // wrap string with different quote
diff --git a/node_modules/ace/lib/ace/mode/sh_highlight_rules.js b/node_modules/ace/lib/ace/mode/sh_highlight_rules.js
index f3fe2db8..c1c0eb6e 100644
--- a/node_modules/ace/lib/ace/mode/sh_highlight_rules.js
+++ b/node_modules/ace/lib/ace/mode/sh_highlight_rules.js
@@ -84,7 +84,7 @@ var ShHighlightRules = function() {
             token : ["text", "comment"],
             regex : /(^|\s)(#.*)$/
         }, {
-            token : "string",
+            token : "string.start",
             regex : '"',
             push : [{
                 token : "constant.language.escape",
@@ -95,7 +95,7 @@ var ShHighlightRules = function() {
                 token : "keyword.operator",
                 regex : /`/ // TODO highlight `
             }, {
-                token : "string",
+                token : "string.end",
                 regex : '"',
                 next: "pop"
             }, {

From 6f212105189d4f6ba6cba8a53826274c965c6000 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Sun, 29 May 2016 17:15:03 +0000
Subject: [PATCH 022/303] Cap number of stored inference values

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 62960b01..0110d129 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
         "c9.ide.language.javascript.immediate": "#c8b1e5767a",
         "c9.ide.language.javascript.eslint": "#4de5457db1",
         "c9.ide.language.javascript.tern": "#64ab01f271",
-        "c9.ide.language.javascript.infer": "#18acb93a3a",
+        "c9.ide.language.javascript.infer": "#a215c77042",
         "c9.ide.language.jsonalyzer": "#d8183d84b4",
         "c9.ide.language.codeintel": "#fc867feec4",
         "c9.ide.collab": "#1c0f841985",

From 2ef51a39b68c77561f1d294c8b8fe83832531330 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Sun, 29 May 2016 17:21:05 +0000
Subject: [PATCH 023/303] Avoid duplicate work

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0110d129..f419ce2e 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
         "c9.ide.language.javascript.immediate": "#c8b1e5767a",
         "c9.ide.language.javascript.eslint": "#4de5457db1",
         "c9.ide.language.javascript.tern": "#64ab01f271",
-        "c9.ide.language.javascript.infer": "#a215c77042",
+        "c9.ide.language.javascript.infer": "#69fbc134d6",
         "c9.ide.language.jsonalyzer": "#d8183d84b4",
         "c9.ide.language.codeintel": "#fc867feec4",
         "c9.ide.collab": "#1c0f841985",

From 1e4566e7187fb20a6e6a45cdfb5181c549316343 Mon Sep 17 00:00:00 2001
From: "Lennart C. L. Kats" <lclkats@gmail.com>
Date: Mon, 30 May 2016 11:54:10 +0200
Subject: [PATCH 024/303] Fix prediction result

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5f5c7107..ab67fb1d 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#0e0c18066c",
         "c9.ide.installer": "#b2e4ba0a92",
-        "c9.ide.language.python": "#aff0772c78",
+        "c9.ide.language.python": "#15e7ff9a3f",
         "c9.ide.language.go": "#6ce1c7a7ef",
         "c9.ide.mount": "#6ddfd05db3",
         "c9.ide.navigate": "#5d5707058c",

From 2fbb13a7b859bd21c3884f553f7bcee67a068d24 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Fri, 27 May 2016 16:05:11 +0000
Subject: [PATCH 025/303] Updating engine.io to latest version to address
 security issue

---
 node_modules/kaefer/package.json | 4 ++--
 package.json                     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/node_modules/kaefer/package.json b/node_modules/kaefer/package.json
index 2b11575a..f661ab70 100644
--- a/node_modules/kaefer/package.json
+++ b/node_modules/kaefer/package.json
@@ -8,8 +8,8 @@
         "email": "fabian@c9.io"
     }],
     "dependencies": {
-        "engine.io": "~1.5.1",
-        "engine.io-client": "~1.5.1",
+        "engine.io": "~1.6.9",
+        "engine.io-client": "~1.6.9",
         "amd-loader": "*"
     },
     "devDependencies": {
diff --git a/package.json b/package.json
index b5732a5c..7c09c927 100644
--- a/package.json
+++ b/package.json
@@ -17,8 +17,8 @@
         "debug": "~0.7.4",
         "ejs": "~1.0.0",
         "emmet": "git://github.com/cloud9ide/emmet-core.git#2ff6dc06ad",
-        "engine.io": "1.5.3",
-        "engine.io-client": "1.5.3",
+        "engine.io": "^1.6.9",
+        "engine.io-client": "^1.6.9",
         "jsonm": "1.0.6",
         "http-error": "~0.0.5",
         "less": "^2.4.0",

From ee07f1b0c7438861cdb5f26d71d78af9d0d0a344 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Mon, 30 May 2016 12:09:08 -0400
Subject: [PATCH 026/303] Fix the engine.io version

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 7c09c927..0e873ada 100644
--- a/package.json
+++ b/package.json
@@ -17,8 +17,8 @@
         "debug": "~0.7.4",
         "ejs": "~1.0.0",
         "emmet": "git://github.com/cloud9ide/emmet-core.git#2ff6dc06ad",
-        "engine.io": "^1.6.9",
-        "engine.io-client": "^1.6.9",
+        "engine.io": "1.6.9",
+        "engine.io-client": "1.6.9",
         "jsonm": "1.0.6",
         "http-error": "~0.0.5",
         "less": "^2.4.0",

From 5b51ac65681b9056d35448f4116e6ca38e001bcd Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Mon, 30 May 2016 17:03:00 +0000
Subject: [PATCH 027/303] Upgrade uglify-js to address security issues

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f4560a05..a841358c 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
         "tern_from_ts": "git://github.com/cloud9ide/tern_from_ts.git#84d51dcb9b16b126a206789d4d4237cde2801fe4",
         "through": "2.2.0",
         "tmp": "~0.0.20",
-        "uglify-js": "2.4.16",
+        "uglify-js": "^2.6.2",
         "ws": "0.4.31",
         "read": "~1.0.5",
         "form-data": "~0.2.0",

From 88fe82a5b95bdb8b7754c808b3ba79ab74796e0e Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Mon, 30 May 2016 19:25:12 +0000
Subject: [PATCH 028/303] Disable rejectUnauthorized in dev mode so vfs works
 in it

---
 configs/client-default.js           | 3 ++-
 plugins/c9.vfs.client/vfs_client.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configs/client-default.js b/configs/client-default.js
index 9f42185b..985416f7 100644
--- a/configs/client-default.js
+++ b/configs/client-default.js
@@ -113,7 +113,8 @@ module.exports = function(options) {
             debug: debug,
             installPath: options.installPath,
             dashboardUrl: options.dashboardUrl,
-            accountUrl: options.accountUrl
+            accountUrl: options.accountUrl,
+            rejectUnauthorized: options.rejectUnauthorized
         },
         {
             packagePath: "plugins/c9.vfs.client/endpoint",
diff --git a/plugins/c9.vfs.client/vfs_client.js b/plugins/c9.vfs.client/vfs_client.js
index 0fb2d9c6..a8b083e9 100644
--- a/plugins/c9.vfs.client/vfs_client.js
+++ b/plugins/c9.vfs.client/vfs_client.js
@@ -242,7 +242,8 @@ define(function(require, exports, module) {
                     port: parsedSocket.port 
                         || parsedSocket.protocol == "https:" ? "443" : null,
                     secure: parsedSocket.protocol 
-                        ? parsedSocket.protocol == "https:" : true
+                        ? parsedSocket.protocol == "https:" : true,
+                    rejectUnauthorized: options.rejectUnauthorized
                 };
                 callback();
             });

From 1888154108407cce67ae21ee1052caecf958acbc Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 30 May 2016 19:56:10 +0000
Subject: [PATCH 029/303] update rusha

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f4560a05..5fae3e07 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
         "netutil": "~0.0.2",
         "optimist": "~0.6.0",
         "qs": "0.6.6",
-        "rusha": "~0.7.2",
+        "rusha": "^0.8.3",
         "send": "~0.1.4",
         "simple-mime": "~0.0.8",
         "tern": "git://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e",

From 58a9a34a57b88ab100928396cc8a4d529f446824 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 31 May 2016 01:09:42 +0200
Subject: [PATCH 030/303] c9-auto-bump 3.1.2577

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f4560a05..7a98638f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2576",
+    "version": "3.1.2577",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From f5f508a2a398b0f4ad7c206cafa511299b85e68b Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 31 May 2016 07:17:22 +0200
Subject: [PATCH 031/303] c9-auto-bump 3.1.2578

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7a98638f..0a0cdbf6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2577",
+    "version": "3.1.2578",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From beae13cce975a9ceb6a94dc7ceacaed8b0720573 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 31 May 2016 09:20:29 +0200
Subject: [PATCH 032/303] c9-auto-bump 3.1.2579

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0a0cdbf6..8b7de8ba 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2578",
+    "version": "3.1.2579",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From b9f32cdbd5f305abcac6302a651826f8697f565a Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 31 May 2016 09:48:57 +0200
Subject: [PATCH 033/303] c9-auto-bump 3.1.2580

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8b7de8ba..a4ab1301 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2579",
+    "version": "3.1.2580",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From d7d405b88e0f57f603a56ac9a246af813c3a13e8 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 31 May 2016 09:53:19 +0200
Subject: [PATCH 034/303] c9-auto-bump 3.1.2581

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a4ab1301..ea77feaf 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2580",
+    "version": "3.1.2581",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From ead08ee48170847c4876b8ac272be10b7a97e22a Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 31 May 2016 09:55:41 +0200
Subject: [PATCH 035/303] c9-auto-bump 3.1.2582

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ea77feaf..8fdbf169 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2581",
+    "version": "3.1.2582",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 42f43389825ba490af96066714e149158c0ff578 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 31 May 2016 15:13:43 +0200
Subject: [PATCH 036/303] c9-auto-bump 3.1.2583

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8fdbf169..68328801 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2582",
+    "version": "3.1.2583",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 24fece0ebd4cd83b020e85d5b07785fe060e6bc4 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 31 May 2016 15:27:41 +0200
Subject: [PATCH 037/303] c9-auto-bump 3.1.2584

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 68328801..6a35131e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2583",
+    "version": "3.1.2584",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 393d1934de91693160488b4c36aba9e42c99c249 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 31 May 2016 15:28:56 +0200
Subject: [PATCH 038/303] c9-auto-bump 3.1.2585

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 85fda235..54694ffc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2584",
+    "version": "3.1.2585",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 759afb9c90c96d8667874d4345db24f4ad9467ac Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 31 May 2016 16:28:28 +0200
Subject: [PATCH 039/303] c9-auto-bump 3.1.2586

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 54694ffc..2eee241f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2585",
+    "version": "3.1.2586",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 3e42058a19e7b3d772245e4b1c0e4f2271007c0a Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 31 May 2016 16:28:47 +0200
Subject: [PATCH 040/303] c9-auto-bump 3.1.2587

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2eee241f..3e6abc26 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2586",
+    "version": "3.1.2587",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From b74aba17253f5733708b36b3305394cf662860c1 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 31 May 2016 16:43:37 +0200
Subject: [PATCH 041/303] c9-auto-bump 3.1.2588

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index baf56d13..d40db4d6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2587",
+    "version": "3.1.2588",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 0458a56462c9a2988cc9d7af45ef65c1af0e7d19 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 31 May 2016 16:44:12 +0200
Subject: [PATCH 042/303] c9-auto-bump 3.1.2589

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d40db4d6..1c73006a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2588",
+    "version": "3.1.2589",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 8e743331f7df2ad8696c4276064e4a49f0c4083e Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 31 May 2016 17:11:58 +0200
Subject: [PATCH 043/303] c9-auto-bump 3.1.2590

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1c73006a..205d27ea 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2589",
+    "version": "3.1.2590",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 2bab00acd05f94aa070a14cd80507fb56283f9a0 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 31 May 2016 17:22:14 +0200
Subject: [PATCH 044/303] c9-auto-bump 3.1.2591

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7a22b4ba..3f371515 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2590",
+    "version": "3.1.2591",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 4f7bc27aff28c9c57b565cca51a33b97185a036f Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 31 May 2016 17:25:30 +0200
Subject: [PATCH 045/303] c9-auto-bump 3.1.2592

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 02f7d092..cd0e68fe 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2591",
+    "version": "3.1.2592",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From e426ee30b76c7a5118434da74f0e6b3c90c8bec8 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 31 May 2016 17:32:35 +0200
Subject: [PATCH 046/303] c9-auto-bump 3.1.2593

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cd0e68fe..acf2a5a7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2592",
+    "version": "3.1.2593",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 159c1c5419fc0b7ccbe170a3a3f3b74d83bb9af9 Mon Sep 17 00:00:00 2001
From: cloud9 <fabian+cloud9@c9.io>
Date: Tue, 31 May 2016 16:31:34 +0000
Subject: [PATCH 047/303] Fixed bug using port specified in the socket

---
 plugins/c9.vfs.client/vfs_client.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/c9.vfs.client/vfs_client.js b/plugins/c9.vfs.client/vfs_client.js
index a8b083e9..0a2c8c6a 100644
--- a/plugins/c9.vfs.client/vfs_client.js
+++ b/plugins/c9.vfs.client/vfs_client.js
@@ -240,7 +240,7 @@ define(function(require, exports, module) {
                     path: parsedSocket.path,
                     host: parsedSocket.host,
                     port: parsedSocket.port 
-                        || parsedSocket.protocol == "https:" ? "443" : null,
+                        || (parsedSocket.protocol == "https:" ? "443" : null),
                     secure: parsedSocket.protocol 
                         ? parsedSocket.protocol == "https:" : true,
                     rejectUnauthorized: options.rejectUnauthorized

From 4e72aa1a08619ca24e6b7d577aad094b9c9bb37a Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 31 May 2016 22:17:58 +0200
Subject: [PATCH 048/303] c9-auto-bump 3.1.2594

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ce5d3e3b..8bcb9649 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2593",
+    "version": "3.1.2594",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From c090e355209486b2c8e9552f3599ecf4b9c14da1 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 31 May 2016 23:01:38 +0200
Subject: [PATCH 049/303] c9-auto-bump 3.1.2595

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8bcb9649..c34dceb3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2594",
+    "version": "3.1.2595",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 34ae6facc03b9bb0d7d4a8d502ecb94435fe898e Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 1 Jun 2016 00:35:15 +0200
Subject: [PATCH 050/303] c9-auto-bump 3.1.2596

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c34dceb3..bd82843a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2595",
+    "version": "3.1.2596",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 471912a5ccd22d9fa1c158c05d1549f3e2eb0f96 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 1 Jun 2016 09:37:18 +0200
Subject: [PATCH 051/303] c9-auto-bump 3.1.2597

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bd82843a..d91db611 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2596",
+    "version": "3.1.2597",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 7c8d57b00084fe460cf2f04d0b7cba44b138479b Mon Sep 17 00:00:00 2001
From: Dana <dana@c9.io>
Date: Wed, 1 Jun 2016 07:54:00 +0000
Subject: [PATCH 052/303] Removes error loggign messsage in case of 403

---
 plugins/c9.error/views/error.html.ejs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/c9.error/views/error.html.ejs b/plugins/c9.error/views/error.html.ejs
index b686bbec..9b66e689 100644
--- a/plugins/c9.error/views/error.html.ejs
+++ b/plugins/c9.error/views/error.html.ejs
@@ -8,11 +8,13 @@
     <div id="wrapper">
       <h1><%=title%></h1>
       <h2><em><%=statusCode%> - <%=scope%></em> <%=error%></h2>
-      <p style="margin-bottom:20px;width:540px">
-        This error has been logged. We will 
-        investigate this further and will prevent this from happening in the
-        future. If this error persists please don't hesitate to contact support.
-      </p>
+      <% if (statusCode != 403) { %>
+        <p style="margin-bottom:20px;width:540px">
+          This error has been logged. We will 
+          investigate this further and will prevent this from happening in the
+          future. If this error persists please don't hesitate to contact support.
+        </p>
+      <% } %>
       
       <% if (showStackTrace) { %>
         <div class="stacktrace">

From fc681d8c8c3133b3338ce67f684d8037bd1443d9 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 1 Jun 2016 10:13:08 +0200
Subject: [PATCH 053/303] c9-auto-bump 3.1.2598

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d91db611..56e81166 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2597",
+    "version": "3.1.2598",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 46a31a41b85801f74a356c4c4fb7e67de777b231 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 1 Jun 2016 10:26:44 +0200
Subject: [PATCH 054/303] c9-auto-bump 3.1.2599

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 56e81166..d0eccd9f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2598",
+    "version": "3.1.2599",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 3d7b5ae3254af757996b391e0fcc817c75038e80 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 1 Jun 2016 10:29:00 +0200
Subject: [PATCH 055/303] c9-auto-bump 3.1.2600

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d0eccd9f..89ba3dda 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2599",
+    "version": "3.1.2600",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 126e998c11f9f05b6b3ca514cce3954068c0c4ee Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 1 Jun 2016 10:59:50 +0200
Subject: [PATCH 056/303] c9-auto-bump 3.1.2601

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 89ba3dda..1a1bc098 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2600",
+    "version": "3.1.2601",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 960b494e288b311c0377f73bb7e86ae5e5c2535a Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 1 Jun 2016 11:39:17 +0200
Subject: [PATCH 057/303] c9-auto-bump 3.1.2602

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1a1bc098..607221eb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2601",
+    "version": "3.1.2602",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 74082c1e1d00f66cf3d9e94719a69b8901a1cd23 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 1 Jun 2016 11:51:07 +0200
Subject: [PATCH 058/303] c9-auto-bump 3.1.2603

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 607221eb..7702c71f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2602",
+    "version": "3.1.2603",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 66707c564aa01bb5e75372fb39fef3e25ef4a195 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 1 Jun 2016 12:28:27 +0200
Subject: [PATCH 059/303] c9-auto-bump 3.1.2604

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7702c71f..6b21434f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2603",
+    "version": "3.1.2604",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From edbd8fc19d4bea335a39f639aada733855bea354 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 1 Jun 2016 12:36:07 +0200
Subject: [PATCH 060/303] c9-auto-bump 3.1.2605

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6b21434f..1a7d8009 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2604",
+    "version": "3.1.2605",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 3e8c7b2167ec5d95723c547015f30d88dd0d8804 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 1 Jun 2016 13:59:16 +0200
Subject: [PATCH 061/303] c9-auto-bump 3.1.2606

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1a7d8009..4b9d3d99 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2605",
+    "version": "3.1.2606",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 13a0c73eb84b3c906b477be30dcc920cfc82d0db Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Wed, 1 Jun 2016 12:32:35 +0000
Subject: [PATCH 062/303] Cleanup

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1a7d8009..cfef610f 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
         "c9.ide.language.javascript.eslint": "#4de5457db1",
         "c9.ide.language.javascript.tern": "#64ab01f271",
         "c9.ide.language.javascript.infer": "#69fbc134d6",
-        "c9.ide.language.jsonalyzer": "#d8183d84b4",
+        "c9.ide.language.jsonalyzer": "#ce973ed167",
         "c9.ide.language.codeintel": "#fc867feec4",
         "c9.ide.collab": "#cfbf987438",
         "c9.ide.local": "#10eb45842a",

From cf1c2cf6d88d05215bf377f96bebbfec71396962 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Wed, 1 Jun 2016 12:33:26 +0000
Subject: [PATCH 063/303] Only measure latency when websocket seems idle

---
 plugins/c9.vfs.client/vfs.ping.js   | 4 ++++
 plugins/c9.vfs.client/vfs_client.js | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/plugins/c9.vfs.client/vfs.ping.js b/plugins/c9.vfs.client/vfs.ping.js
index 4e02ade7..05bdbc9c 100644
--- a/plugins/c9.vfs.client/vfs.ping.js
+++ b/plugins/c9.vfs.client/vfs.ping.js
@@ -9,6 +9,7 @@ define(function(require, exports, module) {
         var Plugin = imports.Plugin;
         var c9 = imports.c9;
         var ext = imports.ext;
+        var vfs = imports.vfs;
 
         /***** Initialization *****/
 
@@ -61,6 +62,9 @@ define(function(require, exports, module) {
             }
 
             if (!api) return callback(new Error("Client is offline"));
+            
+            if (!vfs.isIdle())
+                return vfs.connection.once("message", ping.bind(null, callback));
 
             var start = Date.now();
             api.ping("serverTime", function(err, response) {
diff --git a/plugins/c9.vfs.client/vfs_client.js b/plugins/c9.vfs.client/vfs_client.js
index 0fb2d9c6..9ca3bf84 100644
--- a/plugins/c9.vfs.client/vfs_client.js
+++ b/plugins/c9.vfs.client/vfs_client.js
@@ -329,6 +329,11 @@ define(function(require, exports, module) {
                 bufferedVfsCalls.push([method, path, options, callback]);
         }
         
+        function isIdle() {
+            return !Object.keys(connection.unacked).length &&
+                consumer && !Object.keys(consumer.callbacks || {}).length;
+        }
+        
         /***** Lifecycle *****/
         
         plugin.on("load", function(){
@@ -429,7 +434,9 @@ define(function(require, exports, module) {
             // Extending the API
             use: vfsCall.bind(null, "use"),
             extend: vfsCall.bind(null, "extend"),
-            unextend: vfsCall.bind(null, "unextend")
+            unextend: vfsCall.bind(null, "unextend"),
+            
+            isIdle: isIdle,
         });
         
         register(null, {

From 61d9deaa3a6c5f4aee2d1ac880ed0cac752bcc10 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 1 Jun 2016 14:59:54 +0200
Subject: [PATCH 064/303] c9-auto-bump 3.1.2607

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4b9d3d99..ce40d915 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2606",
+    "version": "3.1.2607",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From cc4cd55155d8a9fa5e904792ce17d6375c4c0882 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 1 Jun 2016 17:28:38 +0200
Subject: [PATCH 065/303] c9-auto-bump 3.1.2608

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ce40d915..b55f23e9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2607",
+    "version": "3.1.2608",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From ea1ff3b9884d2286e93580beda5b33eb6806a943 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 1 Jun 2016 17:39:21 +0200
Subject: [PATCH 066/303] c9-auto-bump 3.1.2609

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b55f23e9..93c179fc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2608",
+    "version": "3.1.2609",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 8267c2bb4a3570625390008c878f10bc0ff58311 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 1 Jun 2016 18:05:58 +0200
Subject: [PATCH 067/303] c9-auto-bump 3.1.2610

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 93c179fc..f6d482c8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2609",
+    "version": "3.1.2610",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From c9c8de3f45c1abafb1d99b74c460b5cab20ef0d3 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Wed, 1 Jun 2016 20:27:54 +0000
Subject: [PATCH 068/303] Fix bug with containers not stopping when ftp mounts
 are dead, also fix bug with mounts not reloading when the container is
 restarted

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ce40d915..31e5ebe6 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
         "c9.ide.installer": "#b2e4ba0a92",
         "c9.ide.language.python": "#aff0772c78",
         "c9.ide.language.go": "#6ce1c7a7ef",
-        "c9.ide.mount": "#6ddfd05db3",
+        "c9.ide.mount": "#2c155d0217",
         "c9.ide.navigate": "#5d5707058c",
         "c9.ide.newresource": "#981a408a7b",
         "c9.ide.openfiles": "#2ae85a9e33",

From 5361392872614f6926366796c52d21ce10b11067 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Wed, 1 Jun 2016 21:24:23 +0000
Subject: [PATCH 069/303] Initialize mounts after sections have loaded

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 46037d14..e4c8c394 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
         "c9.ide.installer": "#b2e4ba0a92",
         "c9.ide.language.python": "#aff0772c78",
         "c9.ide.language.go": "#6ce1c7a7ef",
-        "c9.ide.mount": "#2c155d0217",
+        "c9.ide.mount": "#73a0b6bef0",
         "c9.ide.navigate": "#5d5707058c",
         "c9.ide.newresource": "#981a408a7b",
         "c9.ide.openfiles": "#2ae85a9e33",

From 452c45cc029248f5cfbe4c1a7efeecdf3ed28ca0 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Wed, 1 Jun 2016 21:38:32 +0000
Subject: [PATCH 070/303] Put the node in loading state when it's loading

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e4c8c394..f394c31a 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
         "c9.ide.installer": "#b2e4ba0a92",
         "c9.ide.language.python": "#aff0772c78",
         "c9.ide.language.go": "#6ce1c7a7ef",
-        "c9.ide.mount": "#73a0b6bef0",
+        "c9.ide.mount": "#f00380727a",
         "c9.ide.navigate": "#5d5707058c",
         "c9.ide.newresource": "#981a408a7b",
         "c9.ide.openfiles": "#2ae85a9e33",

From c7d22428cff4312323ceece9ce8871a13cf5253b Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Wed, 1 Jun 2016 21:40:40 +0000
Subject: [PATCH 071/303] Ensure mount is removed from existingMounts array
 when it's initialized

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f394c31a..87d03370 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
         "c9.ide.installer": "#b2e4ba0a92",
         "c9.ide.language.python": "#aff0772c78",
         "c9.ide.language.go": "#6ce1c7a7ef",
-        "c9.ide.mount": "#f00380727a",
+        "c9.ide.mount": "#c16d7d07b2",
         "c9.ide.navigate": "#5d5707058c",
         "c9.ide.newresource": "#981a408a7b",
         "c9.ide.openfiles": "#2ae85a9e33",

From 32c5ec75d6da36a0a4c72c05f93a79636ea25038 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Wed, 1 Jun 2016 23:44:44 -0400
Subject: [PATCH 072/303] Clean up unnecessary code

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 87d03370..d203ea55 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
         "c9.ide.installer": "#b2e4ba0a92",
         "c9.ide.language.python": "#aff0772c78",
         "c9.ide.language.go": "#6ce1c7a7ef",
-        "c9.ide.mount": "#c16d7d07b2",
+        "c9.ide.mount": "#08e3339241",
         "c9.ide.navigate": "#5d5707058c",
         "c9.ide.newresource": "#981a408a7b",
         "c9.ide.openfiles": "#2ae85a9e33",

From 6ac5364fd2c1edcaad3cabccc984686e96181de0 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 09:23:09 +0200
Subject: [PATCH 073/303] c9-auto-bump 3.1.2611

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f6d482c8..47a5f6aa 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2610",
+    "version": "3.1.2611",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From f3ee1ed9c86b684fc9f5148409cb0fb548fd6d81 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 09:42:41 +0200
Subject: [PATCH 074/303] c9-auto-bump 3.1.2612

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 47a5f6aa..bfc57170 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2611",
+    "version": "3.1.2612",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 359bdc2719f92e29071455c52f0d160d0c459ff6 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 09:44:00 +0200
Subject: [PATCH 075/303] c9-auto-bump 3.1.2613

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6e9955fb..25d12c09 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2612",
+    "version": "3.1.2613",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From fb11386ae50d46765aa6bda026dc9224131cd21e Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 09:46:20 +0200
Subject: [PATCH 076/303] c9-auto-bump 3.1.2614

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 25d12c09..10e40615 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2613",
+    "version": "3.1.2614",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From a64e573c460599dfe63a2447da910f8b61512bb6 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 09:49:22 +0200
Subject: [PATCH 077/303] c9-auto-bump 3.1.2615

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 10e40615..9a2cbeb2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2614",
+    "version": "3.1.2615",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 09f89e61dcaff199dac2015815bdd61bfa08b717 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 09:49:46 +0200
Subject: [PATCH 078/303] c9-auto-bump 3.1.2616

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ccc13971..a1c23748 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2615",
+    "version": "3.1.2616",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From c6ca4536891b8172cb160f0baaee68bd66ad9fff Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 09:50:16 +0200
Subject: [PATCH 079/303] c9-auto-bump 3.1.2617

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8e06ec41..328884ef 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2616",
+    "version": "3.1.2617",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 1e4812856867f5aaac2fd395fcff1d380d347c8c Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 09:53:22 +0200
Subject: [PATCH 080/303] c9-auto-bump 3.1.2618

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 328884ef..ccffb076 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2617",
+    "version": "3.1.2618",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 98b1d4af132da37e087fb71db3827b0bac6988b2 Mon Sep 17 00:00:00 2001
From: "Lennart C. L. Kats" <lclkats@gmail.com>
Date: Thu, 2 Jun 2016 10:04:23 +0200
Subject: [PATCH 081/303] Revert "Only measure latency when websocket seems
 idle"

---
 package.json                        | 2 +-
 plugins/c9.vfs.client/vfs.ping.js   | 4 ----
 plugins/c9.vfs.client/vfs_client.js | 9 +--------
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index ccffb076..706540c3 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
         "c9.ide.language.javascript.eslint": "#4de5457db1",
         "c9.ide.language.javascript.tern": "#64ab01f271",
         "c9.ide.language.javascript.infer": "#69fbc134d6",
-        "c9.ide.language.jsonalyzer": "#ce973ed167",
+        "c9.ide.language.jsonalyzer": "#16f04e4469",
         "c9.ide.language.codeintel": "#fc867feec4",
         "c9.ide.collab": "#cfbf987438",
         "c9.ide.local": "#10eb45842a",
diff --git a/plugins/c9.vfs.client/vfs.ping.js b/plugins/c9.vfs.client/vfs.ping.js
index 05bdbc9c..4e02ade7 100644
--- a/plugins/c9.vfs.client/vfs.ping.js
+++ b/plugins/c9.vfs.client/vfs.ping.js
@@ -9,7 +9,6 @@ define(function(require, exports, module) {
         var Plugin = imports.Plugin;
         var c9 = imports.c9;
         var ext = imports.ext;
-        var vfs = imports.vfs;
 
         /***** Initialization *****/
 
@@ -62,9 +61,6 @@ define(function(require, exports, module) {
             }
 
             if (!api) return callback(new Error("Client is offline"));
-            
-            if (!vfs.isIdle())
-                return vfs.connection.once("message", ping.bind(null, callback));
 
             var start = Date.now();
             api.ping("serverTime", function(err, response) {
diff --git a/plugins/c9.vfs.client/vfs_client.js b/plugins/c9.vfs.client/vfs_client.js
index 9ca3bf84..0fb2d9c6 100644
--- a/plugins/c9.vfs.client/vfs_client.js
+++ b/plugins/c9.vfs.client/vfs_client.js
@@ -329,11 +329,6 @@ define(function(require, exports, module) {
                 bufferedVfsCalls.push([method, path, options, callback]);
         }
         
-        function isIdle() {
-            return !Object.keys(connection.unacked).length &&
-                consumer && !Object.keys(consumer.callbacks || {}).length;
-        }
-        
         /***** Lifecycle *****/
         
         plugin.on("load", function(){
@@ -434,9 +429,7 @@ define(function(require, exports, module) {
             // Extending the API
             use: vfsCall.bind(null, "use"),
             extend: vfsCall.bind(null, "extend"),
-            unextend: vfsCall.bind(null, "unextend"),
-            
-            isIdle: isIdle,
+            unextend: vfsCall.bind(null, "unextend")
         });
         
         register(null, {

From 03a6f109e51ecc93a036429bd8afb51524671770 Mon Sep 17 00:00:00 2001
From: "Lennart C. L. Kats" <lclkats@gmail.com>
Date: Thu, 2 Jun 2016 10:04:58 +0200
Subject: [PATCH 082/303] Revert "Revert "Only measure latency when websocket
 seems idle""

---
 package.json                        | 2 +-
 plugins/c9.vfs.client/vfs.ping.js   | 4 ++++
 plugins/c9.vfs.client/vfs_client.js | 9 ++++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 706540c3..001c441b 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
         "c9.ide.language.javascript.eslint": "#4de5457db1",
         "c9.ide.language.javascript.tern": "#64ab01f271",
         "c9.ide.language.javascript.infer": "#69fbc134d6",
-        "c9.ide.language.jsonalyzer": "#16f04e4469",
+        "c9.ide.language.jsonalyzer": "#2b1878b731",
         "c9.ide.language.codeintel": "#fc867feec4",
         "c9.ide.collab": "#cfbf987438",
         "c9.ide.local": "#10eb45842a",
diff --git a/plugins/c9.vfs.client/vfs.ping.js b/plugins/c9.vfs.client/vfs.ping.js
index 4e02ade7..05bdbc9c 100644
--- a/plugins/c9.vfs.client/vfs.ping.js
+++ b/plugins/c9.vfs.client/vfs.ping.js
@@ -9,6 +9,7 @@ define(function(require, exports, module) {
         var Plugin = imports.Plugin;
         var c9 = imports.c9;
         var ext = imports.ext;
+        var vfs = imports.vfs;
 
         /***** Initialization *****/
 
@@ -61,6 +62,9 @@ define(function(require, exports, module) {
             }
 
             if (!api) return callback(new Error("Client is offline"));
+            
+            if (!vfs.isIdle())
+                return vfs.connection.once("message", ping.bind(null, callback));
 
             var start = Date.now();
             api.ping("serverTime", function(err, response) {
diff --git a/plugins/c9.vfs.client/vfs_client.js b/plugins/c9.vfs.client/vfs_client.js
index 0fb2d9c6..9ca3bf84 100644
--- a/plugins/c9.vfs.client/vfs_client.js
+++ b/plugins/c9.vfs.client/vfs_client.js
@@ -329,6 +329,11 @@ define(function(require, exports, module) {
                 bufferedVfsCalls.push([method, path, options, callback]);
         }
         
+        function isIdle() {
+            return !Object.keys(connection.unacked).length &&
+                consumer && !Object.keys(consumer.callbacks || {}).length;
+        }
+        
         /***** Lifecycle *****/
         
         plugin.on("load", function(){
@@ -429,7 +434,9 @@ define(function(require, exports, module) {
             // Extending the API
             use: vfsCall.bind(null, "use"),
             extend: vfsCall.bind(null, "extend"),
-            unextend: vfsCall.bind(null, "unextend")
+            unextend: vfsCall.bind(null, "unextend"),
+            
+            isIdle: isIdle,
         });
         
         register(null, {

From 3c8c1dc8e12a369d298060d6454cf2e18478f61c Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 10:05:10 +0200
Subject: [PATCH 083/303] c9-auto-bump 3.1.2619

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 706540c3..6681d934 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2618",
+    "version": "3.1.2619",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 7e68b7b85adfa67c7820cbe7b34279d5ee5c5632 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 10:13:26 +0200
Subject: [PATCH 084/303] c9-auto-bump 3.1.2620

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 70f66b8e..1cb4833b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2619",
+    "version": "3.1.2620",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From aab32bb86e95d0bf46079d00d964cbea88b29a65 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 10:18:56 +0200
Subject: [PATCH 085/303] c9-auto-bump 3.1.2621

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1cb4833b..e2ab51c2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2620",
+    "version": "3.1.2621",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 5cad3449c3782f9ac6c4e520eafadc18c87f2af7 Mon Sep 17 00:00:00 2001
From: Chris Brown <cbrown@fico.com>
Date: Thu, 2 Jun 2016 09:25:44 +0100
Subject: [PATCH 086/303] URI-encode commas in filenames explicitly, because
 they are used as a separator

---
 plugins/c9.vfs.client/vfs_client.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/c9.vfs.client/vfs_client.js b/plugins/c9.vfs.client/vfs_client.js
index 44f3b1a1..eade1caf 100644
--- a/plugins/c9.vfs.client/vfs_client.js
+++ b/plugins/c9.vfs.client/vfs_client.js
@@ -193,7 +193,7 @@ define(function(require, exports, module) {
                 extraPaths = path;
                 path = path[0];
                 extraPaths = "," + extraPaths.map(function(p) {
-                    return p[0] == path[0] && p != path ? encodeURI(p) : "";
+                    return p[0] == path[0] && p != path ? encodeURI(p).replace(/,/g, "%2C") : "";
                 }).filter(Boolean).join(",");
             }
             window.open(vfsUrl(path) + extraPaths

From 76d4c50408a884029dd82a4a3e11f9c7b0a3764e Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 10:26:30 +0200
Subject: [PATCH 087/303] c9-auto-bump 3.1.2622

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e2ab51c2..3c268e71 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2621",
+    "version": "3.1.2622",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 5e0d7f60efbcb4b4c3a82ca0627c33dc92bcad9e Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 10:45:30 +0200
Subject: [PATCH 088/303] c9-auto-bump 3.1.2623

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3c268e71..31ed1695 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2622",
+    "version": "3.1.2623",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 69f1de409fcbe06e044071a7d2e2429bd02125fa Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Thu, 2 Jun 2016 08:40:10 +0000
Subject: [PATCH 089/303] Change to Cloud9 SDK license

---
 package.json | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 1a7d8009..faf386f5 100644
--- a/package.json
+++ b/package.json
@@ -58,24 +58,25 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#79bcb2fe06",
-        "c9.ide.language.css": "#be07d72209",
-        "c9.ide.language.generic": "#3949510863",
-        "c9.ide.language.html": "#22fdc74869",
-        "c9.ide.language.html.diff": "#24f3608d26",
-        "c9.ide.language.javascript": "#e626169643",
-        "c9.ide.language.javascript.immediate": "#c8b1e5767a",
-        "c9.ide.language.javascript.eslint": "#4de5457db1",
-        "c9.ide.language.javascript.tern": "#64ab01f271",
-        "c9.ide.language.javascript.infer": "#69fbc134d6",
-        "c9.ide.language.jsonalyzer": "#d8183d84b4",
-        "c9.ide.language.codeintel": "#fc867feec4",
-        "c9.ide.collab": "#cfbf987438",
-        "c9.ide.local": "#10eb45842a",
-        "c9.ide.find": "#e33fbaed2f",
-        "c9.ide.find.infiles": "#bd34c29373",
-        "c9.ide.find.replace": "#810ebf8bfb",
-        "c9.ide.run.debug": "#317feee072",
+        "c9.ide.language": "#57be17654e",
+        "c9.ide.language.core": "#undefined",
+        "c9.ide.language.css": "#605d0860c0",
+        "c9.ide.language.generic": "#b47cbe58f9",
+        "c9.ide.language.html": "#6ecb73a17b",
+        "c9.ide.language.html.diff": "#7d6cecfb90",
+        "c9.ide.language.javascript": "#4b525dd640",
+        "c9.ide.language.javascript.immediate": "#82c426dbca",
+        "c9.ide.language.javascript.eslint": "#cb9e3f5a8e",
+        "c9.ide.language.javascript.tern": "#47e2d4e867",
+        "c9.ide.language.javascript.infer": "#b9c2e4bdb8",
+        "c9.ide.language.jsonalyzer": "#0d7d2ccb9f",
+        "c9.ide.language.codeintel": "#4e0a272229",
+        "c9.ide.collab": "#79b094a770",
+        "c9.ide.local": "#9169fec157",
+        "c9.ide.find": "#a2dfc3e306",
+        "c9.ide.find.infiles": "#488db22ee1",
+        "c9.ide.find.replace": "#47a84af707",
+        "c9.ide.run.debug": "#3a13207ef8",
         "c9.automate": "#47e2c429c9",
         "c9.ide.ace.emmet": "#6dc4585e02",
         "c9.ide.ace.gotoline": "#a8ff07c8f4",

From 7b5ceea2db8a9012b8647e03756a50baf87525b9 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Thu, 2 Jun 2016 09:19:04 +0000
Subject: [PATCH 090/303] Split c9.ide.language into two plugins

---
 configs/client-default.js | 14 +++++++-------
 package.json              | 14 +++++++-------
 scripts/makelocal.sh      |  2 +-
 scripts/makestandalone.sh |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/configs/client-default.js b/configs/client-default.js
index 550221b9..319879dd 100644
--- a/configs/client-default.js
+++ b/configs/client-default.js
@@ -308,13 +308,13 @@ module.exports = function(options) {
             staticPrefix: staticPrefix,
             workerPrefix: options.CORSWorkerPrefix // "/static/standalone/worker"
         },
-        "plugins/c9.ide.language/keyhandler",
-        "plugins/c9.ide.language/complete",
-        "plugins/c9.ide.language/quickfix",
-        "plugins/c9.ide.language/marker",
-        "plugins/c9.ide.language/refactor",
-        "plugins/c9.ide.language/tooltip",
-        "plugins/c9.ide.language/jumptodef",
+        "plugins/c9.ide.language.core/keyhandler",
+        "plugins/c9.ide.language.core/complete",
+        "plugins/c9.ide.language.core/quickfix",
+        "plugins/c9.ide.language.core/marker",
+        "plugins/c9.ide.language.core/refactor",
+        "plugins/c9.ide.language.core/tooltip",
+        "plugins/c9.ide.language.core/jumptodef",
         "plugins/c9.ide.language/worker_util_helper",
         {
             packagePath: "plugins/c9.ide.language.generic/generic",
diff --git a/package.json b/package.json
index faf386f5..ba2da062 100644
--- a/package.json
+++ b/package.json
@@ -58,18 +58,18 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#57be17654e",
-        "c9.ide.language.core": "#undefined",
-        "c9.ide.language.css": "#605d0860c0",
+        "c9.ide.language": "#eb4b0cd95a",
+        "c9.ide.language.core": "#82e9ed1729",
+        "c9.ide.language.css": "#46ad561506",
         "c9.ide.language.generic": "#b47cbe58f9",
         "c9.ide.language.html": "#6ecb73a17b",
         "c9.ide.language.html.diff": "#7d6cecfb90",
-        "c9.ide.language.javascript": "#4b525dd640",
+        "c9.ide.language.javascript": "#f91500296c",
         "c9.ide.language.javascript.immediate": "#82c426dbca",
         "c9.ide.language.javascript.eslint": "#cb9e3f5a8e",
-        "c9.ide.language.javascript.tern": "#47e2d4e867",
+        "c9.ide.language.javascript.tern": "#4dedbbef74",
         "c9.ide.language.javascript.infer": "#b9c2e4bdb8",
-        "c9.ide.language.jsonalyzer": "#0d7d2ccb9f",
+        "c9.ide.language.jsonalyzer": "#d5444f6b2c",
         "c9.ide.language.codeintel": "#4e0a272229",
         "c9.ide.collab": "#79b094a770",
         "c9.ide.local": "#9169fec157",
@@ -116,7 +116,7 @@
         "c9.ide.scm": "#637a68cd04",
         "c9.ide.terminal.monitor": "#affa33572f",
         "c9.ide.test": "#102942ae4e",
-        "c9.ide.test.mocha": "#fc053b23d2",
+        "c9.ide.test.mocha": "#38151a98c3",
         "c9.ide.theme.flat": "#81dadeee55",
         "c9.ide.threewaymerge": "#229382aa0b",
         "c9.ide.undo": "#b028bcb4d5",
diff --git a/scripts/makelocal.sh b/scripts/makelocal.sh
index 0d585e44..476edce6 100755
--- a/scripts/makelocal.sh
+++ b/scripts/makelocal.sh
@@ -31,7 +31,7 @@ CDN="../server.js $CDN_SETTINGS --settings local --version=standalone --cache $C
 mkdir -p "$CACHE/standalone/modules/lib/emmet"
 cp "$CURDIR/../node_modules/emmet/emmet.js" "$CACHE/standalone/modules/lib/emmet/"
 
-WORKER=plugins/c9.ide.language/worker
+WORKER=plugins/c9.ide.language.core/worker
 echo building worker $WORKER
 $CDN --worker $WORKER
 echo $CDN --worker $WORKER
diff --git a/scripts/makestandalone.sh b/scripts/makestandalone.sh
index 9fe3aefa..622efe2e 100755
--- a/scripts/makestandalone.sh
+++ b/scripts/makestandalone.sh
@@ -31,7 +31,7 @@ CDN="$CURDIR/../server.js cdn-cli -s standalone --server-config standalone --ser
 # build async loaded ace modules
 $CDN --module ace
 
-WORKER=plugins/c9.ide.language/worker
+WORKER=plugins/c9.ide.language.core/worker
 echo building worker $WORKER
 $CDN --worker $WORKER
 echo $CDN --worker $WORKER

From bc21b749be8b6e0290ed3682dfd25b6c8ca44bd3 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 11:33:05 +0200
Subject: [PATCH 091/303] c9-auto-bump 3.1.2624

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 31ed1695..f8a25946 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2623",
+    "version": "3.1.2624",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 63b37d04371f82fdb6d7bb1e564a3a2657b528f9 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 11:41:50 +0200
Subject: [PATCH 092/303] c9-auto-bump 3.1.2625

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f8a25946..c28308d5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2624",
+    "version": "3.1.2625",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 7e9797413bfadb358ea4824c47743cc3d94464fa Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 11:58:38 +0200
Subject: [PATCH 093/303] c9-auto-bump 3.1.2626

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c28308d5..abc98c40 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2625",
+    "version": "3.1.2626",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 1cad35c73368cb7d26916ff9bb9c794f2d752561 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 11:59:08 +0200
Subject: [PATCH 094/303] c9-auto-bump 3.1.2627

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index abc98c40..24f491e3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2626",
+    "version": "3.1.2627",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 90fb8bc9c70ba6fc80de5e68efe98efa66937aab Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Thu, 2 Jun 2016 10:04:50 +0000
Subject: [PATCH 095/303] Fix path

---
 configs/client-default.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/client-default.js b/configs/client-default.js
index 319879dd..f17dac84 100644
--- a/configs/client-default.js
+++ b/configs/client-default.js
@@ -599,7 +599,7 @@ module.exports = function(options) {
             packagePath: "plugins/c9.ide.keys/panel"
         },
         {
-            packagePath: "plugins/c9.ide.language/outline",
+            packagePath: "plugins/c9.ide.language.core/outline",
             staticPrefix: staticPrefix + "/plugins/c9.ide.language"
         },
         {

From 574029390907ffd2c1744448649ae47f24ed4768 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Thu, 2 Jun 2016 10:08:41 +0000
Subject: [PATCH 096/303] Fix paths

---
 package.json               | 4 ++--
 plugins/c9.static/build.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 46b9527a..9f19765e 100644
--- a/package.json
+++ b/package.json
@@ -64,12 +64,12 @@
         "c9.ide.language.generic": "#b47cbe58f9",
         "c9.ide.language.html": "#6ecb73a17b",
         "c9.ide.language.html.diff": "#7d6cecfb90",
-        "c9.ide.language.javascript": "#f91500296c",
+        "c9.ide.language.javascript": "#b82f16e56a",
         "c9.ide.language.javascript.immediate": "#82c426dbca",
         "c9.ide.language.javascript.eslint": "#cb9e3f5a8e",
         "c9.ide.language.javascript.tern": "#4dedbbef74",
         "c9.ide.language.javascript.infer": "#b9c2e4bdb8",
-        "c9.ide.language.jsonalyzer": "#60a25f327a",
+        "c9.ide.language.jsonalyzer": "#72954f8da1",
         "c9.ide.language.codeintel": "#4e0a272229",
         "c9.ide.collab": "#79b094a770",
         "c9.ide.local": "#9169fec157",
diff --git a/plugins/c9.static/build.js b/plugins/c9.static/build.js
index b8e69593..f53dc540 100644
--- a/plugins/c9.static/build.js
+++ b/plugins/c9.static/build.js
@@ -234,7 +234,7 @@ function main(options, imports, register) {
     
     function buildWorker(module, pathConfig, callback) {
         var modules = [module];
-        if (module == "plugins/c9.ide.language/worker") {
+        if (module == "plugins/c9.ide.language.core/worker") {
             // jsonalyzer is missing in built version of local
             var jsonalyzer = require("../c9.ide.language.jsonalyzer/default_plugins");
             var extraPackages = [
@@ -251,7 +251,7 @@ function main(options, imports, register) {
             } catch(e) {}
             // TODO find a saner method for managing files loaded in language worker
             modules = [
-                "plugins/c9.ide.language/worker",
+                "plugins/c9.ide.language.core/worker",
                 "plugins/c9.ide.language.generic/local_completer",
                 "plugins/c9.ide.language.generic/snippet_completer",
                 "plugins/c9.ide.language.generic/mode_completer",

From 6d47a0098eea2a95de6c51ca0ad0293ec4174269 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 12:26:44 +0200
Subject: [PATCH 097/303] c9-auto-bump 3.1.2628

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 24f491e3..8fb5c6cb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2627",
+    "version": "3.1.2628",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 5d012dc27f39c6d585dc95e4e54cb8ab961efed8 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Thu, 2 Jun 2016 10:42:25 +0000
Subject: [PATCH 098/303] Add extra guard for tests

---
 plugins/c9.vfs.client/vfs_client.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/c9.vfs.client/vfs_client.js b/plugins/c9.vfs.client/vfs_client.js
index 9ca3bf84..9ab1e380 100644
--- a/plugins/c9.vfs.client/vfs_client.js
+++ b/plugins/c9.vfs.client/vfs_client.js
@@ -330,8 +330,10 @@ define(function(require, exports, module) {
         }
         
         function isIdle() {
+            if (!connection || !consumer)
+                return false;
             return !Object.keys(connection.unacked).length &&
-                consumer && !Object.keys(consumer.callbacks || {}).length;
+                !Object.keys(consumer.callbacks || {}).length;
         }
         
         /***** Lifecycle *****/

From e0ab7bddc76e3e9b7ec83ee04013d0d60d7368ec Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 12:45:28 +0200
Subject: [PATCH 099/303] c9-auto-bump 3.1.2629

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8fb5c6cb..a8fbea18 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2628",
+    "version": "3.1.2629",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From b3a10c72c215d55a74c21dad23ebaabe9cabe9d4 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Thu, 2 Jun 2016 10:50:21 +0000
Subject: [PATCH 100/303] Add warning

For seriously don't silently eat my urls kthxbye
---
 node_modules/connect-architect/connect.redirect/redirect.js | 4 +++-
 package.json                                                | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/node_modules/connect-architect/connect.redirect/redirect.js b/node_modules/connect-architect/connect.redirect/redirect.js
index f9e10cd3..7d18de2d 100644
--- a/node_modules/connect-architect/connect.redirect/redirect.js
+++ b/node_modules/connect-architect/connect.redirect/redirect.js
@@ -16,8 +16,10 @@ module.exports = function(options, imports, register) {
     imports.connect.addResponseMethod("secureRedirect", function(location) {
         var parsedLocation = url.parse(location, false, true);
 
-        if (!trustedDomainsRe.test(parsedLocation.host))
+        if (!trustedDomainsRe.test(parsedLocation.host)) {
+            console.log("Avoiding untrusted redirect to", parsedLocation.host)
             location = parsedLocation.path || "/";
+        }
            
         this.redirect(location); 
     });
diff --git a/package.json b/package.json
index 1a7d8009..4e23c46a 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     ],
     "c9plugins": {
         "c9.ide.language": "#79bcb2fe06",
+        "c9.ide.language.core": "#undefined",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#3949510863",
         "c9.ide.language.html": "#22fdc74869",

From b12939b1d1eda786a8c06dddb10bf9022764afcf Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Thu, 2 Jun 2016 11:06:10 +0000
Subject: [PATCH 101/303] Fix relative paths

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9f19765e..4a4af388 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#eb4b0cd95a",
+        "c9.ide.language": "#a475368d6d",
         "c9.ide.language.core": "#6d594f4eda",
         "c9.ide.language.css": "#46ad561506",
         "c9.ide.language.generic": "#b47cbe58f9",

From 6e0c8a0c227049f7a4cdebae662c304e8473e600 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Thu, 2 Jun 2016 11:07:11 +0000
Subject: [PATCH 102/303] Fix relative paths

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4a4af388..33b22131 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     ],
     "c9plugins": {
         "c9.ide.language": "#a475368d6d",
-        "c9.ide.language.core": "#6d594f4eda",
+        "c9.ide.language.core": "#233a0b4023",
         "c9.ide.language.css": "#46ad561506",
         "c9.ide.language.generic": "#b47cbe58f9",
         "c9.ide.language.html": "#6ecb73a17b",

From f5f96a451789247cf28b2a0b60bbd53910157f06 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 15:11:24 +0200
Subject: [PATCH 103/303] c9-auto-bump 3.1.2630

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a8fbea18..9bf596ae 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2629",
+    "version": "3.1.2630",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 7541960365a58a55a350ded95ff2a947ef897589 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 15:19:06 +0200
Subject: [PATCH 104/303] c9-auto-bump 3.1.2631

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9bf596ae..e16c336a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2630",
+    "version": "3.1.2631",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 5b4fc0f3860297ab4d10e39f51b52f5c8e131abe Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 16:08:35 +0200
Subject: [PATCH 105/303] c9-auto-bump 3.1.2632

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e16c336a..0d06985c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2631",
+    "version": "3.1.2632",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 3ca3e3a2e0a589ff1671a025699b54140a1509b1 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 16:10:47 +0200
Subject: [PATCH 106/303] c9-auto-bump 3.1.2633

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0d06985c..be32a883 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2632",
+    "version": "3.1.2633",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 74eed885664ed802c2f2f266f0f5eee7732bf268 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Thu, 2 Jun 2016 14:34:42 +0000
Subject: [PATCH 107/303] Adding test for existingMounts and fixing existing
 tests

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 87d03370..ccca9f8d 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
         "c9.ide.installer": "#b2e4ba0a92",
         "c9.ide.language.python": "#aff0772c78",
         "c9.ide.language.go": "#6ce1c7a7ef",
-        "c9.ide.mount": "#c16d7d07b2",
+        "c9.ide.mount": "#46e54cb569",
         "c9.ide.navigate": "#5d5707058c",
         "c9.ide.newresource": "#981a408a7b",
         "c9.ide.openfiles": "#2ae85a9e33",

From 9f9b47dba30cf537be9d40c1f27a5ed2aeca8469 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Thu, 2 Jun 2016 14:43:57 +0000
Subject: [PATCH 108/303] Remove console.log

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e35ab155..96b2e0b4 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
         "c9.ide.installer": "#b2e4ba0a92",
         "c9.ide.language.python": "#15e7ff9a3f",
         "c9.ide.language.go": "#6ce1c7a7ef",
-        "c9.ide.mount": "#df385a8b6c",
+        "c9.ide.mount": "#3001a633f2",
         "c9.ide.navigate": "#5d5707058c",
         "c9.ide.newresource": "#981a408a7b",
         "c9.ide.openfiles": "#2ae85a9e33",

From 2cd527ef48ef42c5b1b7338047b02f65d06db5ad Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 16:50:35 +0200
Subject: [PATCH 109/303] c9-auto-bump 3.1.2634

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index be32a883..5a0d3684 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2633",
+    "version": "3.1.2634",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 99b3fb10c2adc746231545651e16e5e67eb6a257 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 17:35:47 +0200
Subject: [PATCH 110/303] c9-auto-bump 3.1.2635

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5a0d3684..29772673 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2634",
+    "version": "3.1.2635",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From cd7381da35f4186d06fc01e8fe4a6a676c62bbcc Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 18:09:47 +0200
Subject: [PATCH 111/303] c9-auto-bump 3.1.2636

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9b852a3b..e244d2e4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2635",
+    "version": "3.1.2636",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 3a526d43f22d5fb48025ed0c891c656e181b9750 Mon Sep 17 00:00:00 2001
From: Dan Armendariz <danallan@cs.harvard.edu>
Date: Fri, 13 May 2016 23:03:34 +0000
Subject: [PATCH 112/303] gdb store thread id in frame object

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9d2307fd..ff93111c 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     ],
     "c9plugins": {
         "c9.ide.language": "#79bcb2fe06",
+        "c9.ide.language.core": "#undefined",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#3949510863",
         "c9.ide.language.html": "#22fdc74869",
@@ -75,7 +76,7 @@
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#bd34c29373",
         "c9.ide.find.replace": "#810ebf8bfb",
-        "c9.ide.run.debug": "#317feee072",
+        "c9.ide.run.debug": "#a33603ad5a",
         "c9.automate": "#47e2c429c9",
         "c9.ide.ace.emmet": "#6dc4585e02",
         "c9.ide.ace.gotoline": "#a8ff07c8f4",

From 14b924ac94e1b9e7d4e9ad0818604a292094ce57 Mon Sep 17 00:00:00 2001
From: Dan Armendariz <danallan@cs.harvard.edu>
Date: Fri, 13 May 2016 23:04:04 +0000
Subject: [PATCH 113/303] gdb add frame and thread info to evaluate method

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ff93111c..9aa9fa3a 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#bd34c29373",
         "c9.ide.find.replace": "#810ebf8bfb",
-        "c9.ide.run.debug": "#a33603ad5a",
+        "c9.ide.run.debug": "#57a1a4c1b3",
         "c9.automate": "#47e2c429c9",
         "c9.ide.ace.emmet": "#6dc4585e02",
         "c9.ide.ace.gotoline": "#a8ff07c8f4",

From 99606cb4e733674c8386b56331d49e890f650ed8 Mon Sep 17 00:00:00 2001
From: Dan Armendariz <danallan@cs.harvard.edu>
Date: Sat, 14 May 2016 00:50:16 +0000
Subject: [PATCH 114/303] gdb evaluate method fix returned type information

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9aa9fa3a..93e7fa4f 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#bd34c29373",
         "c9.ide.find.replace": "#810ebf8bfb",
-        "c9.ide.run.debug": "#57a1a4c1b3",
+        "c9.ide.run.debug": "#7425f903d0",
         "c9.automate": "#47e2c429c9",
         "c9.ide.ace.emmet": "#6dc4585e02",
         "c9.ide.ace.gotoline": "#a8ff07c8f4",

From 33e918ac4066913662d27b4787cfe68aa98fe15b Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 2 Jun 2016 18:50:42 +0200
Subject: [PATCH 115/303] c9-auto-bump 3.1.2637

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 11c67fd2..89be0972 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2636",
+    "version": "3.1.2637",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 534ff8a8bca38caaa4c61843dbd8fbd8f2827656 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 3 Jun 2016 00:06:32 +0200
Subject: [PATCH 116/303] c9-auto-bump 3.1.2638

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 89be0972..fef43d46 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2637",
+    "version": "3.1.2638",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 7543940fbdb23ddcebe16a8057b6274f15c3d24b Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 3 Jun 2016 00:18:22 +0200
Subject: [PATCH 117/303] c9-auto-bump 3.1.2639

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fef43d46..3a5f1666 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2638",
+    "version": "3.1.2639",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From f2c92a7819cabf2a1034a5bd7b1841d1d29a13d3 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Fri, 3 Jun 2016 01:11:32 +0000
Subject: [PATCH 118/303] Remove fsHash from Revisions, don't do hash
 comparison checks

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 574011e8..1398e6ce 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "c9.ide.language.javascript.infer": "#69fbc134d6",
         "c9.ide.language.jsonalyzer": "#2b1878b731",
         "c9.ide.language.codeintel": "#fc867feec4",
-        "c9.ide.collab": "#799edb6836",
+        "c9.ide.collab": "#673d1aaf34",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#bd34c29373",

From fd5b54d379490ae5085609f1ef6451b817e7315c Mon Sep 17 00:00:00 2001
From: Matthijs van Henten <matthijs+foo@technischepartij.nl>
Date: Fri, 3 Jun 2016 08:57:22 +0000
Subject: [PATCH 119/303] disables salesforce ws type

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 3a5f1666..9eb098dc 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     ],
     "c9plugins": {
         "c9.ide.language": "#b8f73a9da1",
+        "c9.ide.language.core": "#undefined",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#3949510863",
         "c9.ide.language.html": "#22fdc74869",

From e6294a1f752d5f3420317bfd1977c30feeda16d9 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 3 Jun 2016 11:21:07 +0200
Subject: [PATCH 120/303] c9-auto-bump 3.1.2640

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9eb098dc..3d1e687a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2639",
+    "version": "3.1.2640",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From e6f236c44051e5cc7d2becc5f5356746c0ea8db2 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 3 Jun 2016 11:21:53 +0200
Subject: [PATCH 121/303] c9-auto-bump 3.1.2641

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3d1e687a..6f66d00d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2640",
+    "version": "3.1.2641",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 2a9592bd3b8749a32bfe98929030c50f64052211 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 3 Jun 2016 11:29:46 +0200
Subject: [PATCH 122/303] c9-auto-bump 3.1.2642

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 72080c0e..e30ac703 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2641",
+    "version": "3.1.2642",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 2617688031ac8460f5e8227ae80dae401bf78290 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 3 Jun 2016 11:41:42 +0200
Subject: [PATCH 123/303] c9-auto-bump 3.1.2643

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e378f240..2f1a8a3f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2642",
+    "version": "3.1.2643",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 814c38729af49dd4a66a6d8ca370ec53651cc64f Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 3 Jun 2016 11:43:13 +0200
Subject: [PATCH 124/303] c9-auto-bump 3.1.2644

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2f1a8a3f..6417d5ff 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2643",
+    "version": "3.1.2644",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 2b045d0ab8ac23ceb05a850db281c412a7ba18a7 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 3 Jun 2016 11:46:18 +0200
Subject: [PATCH 125/303] c9-auto-bump 3.1.2645

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6417d5ff..fa3a91c1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2644",
+    "version": "3.1.2645",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 6c4e572dfd32d9ec74c3afcb0b4c4012467875ef Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 3 Jun 2016 14:35:26 +0400
Subject: [PATCH 126/303] remove browsersupport.js

---
 configs/client-default.js                     |   1 -
 package.json                                  |  14 +--
 .../c9.ide.browsersupport/browsersupport.js   | 118 ------------------
 plugins/c9.ide.plugins/manager.js             |   2 +-
 4 files changed, 8 insertions(+), 127 deletions(-)
 delete mode 100644 plugins/c9.ide.browsersupport/browsersupport.js

diff --git a/configs/client-default.js b/configs/client-default.js
index 69e09db0..a72c3721 100644
--- a/configs/client-default.js
+++ b/configs/client-default.js
@@ -754,7 +754,6 @@ module.exports = function(options) {
             packagePath: "plugins/c9.ide.behaviors/page",
             staticPrefix: staticPrefix + "/plugins/c9.ide.behaviors"
         },
-        "plugins/c9.ide.browsersupport/browsersupport",
         {
             packagePath: "plugins/c9.ide.preferences/preferences",
             staticPrefix: staticPrefix + "/plugins/c9.ide.preferences"
diff --git a/package.json b/package.json
index fa3a91c1..98a86fc9 100644
--- a/package.json
+++ b/package.json
@@ -58,8 +58,8 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#a475368d6d",
-        "c9.ide.language.core": "#233a0b4023",
+        "c9.ide.language": "#f62951109c",
+        "c9.ide.language.core": "#2945e91cb6",
         "c9.ide.language.css": "#46ad561506",
         "c9.ide.language.generic": "#b47cbe58f9",
         "c9.ide.language.html": "#6ecb73a17b",
@@ -67,19 +67,19 @@
         "c9.ide.language.javascript": "#b82f16e56a",
         "c9.ide.language.javascript.immediate": "#82c426dbca",
         "c9.ide.language.javascript.eslint": "#cb9e3f5a8e",
-        "c9.ide.language.javascript.tern": "#4dedbbef74",
+        "c9.ide.language.javascript.tern": "#0545a6385d",
         "c9.ide.language.javascript.infer": "#b9c2e4bdb8",
-        "c9.ide.language.jsonalyzer": "#72954f8da1",
+        "c9.ide.language.jsonalyzer": "#a32369793c",
         "c9.ide.language.codeintel": "#4e0a272229",
         "c9.ide.collab": "#79b094a770",
         "c9.ide.local": "#9169fec157",
         "c9.ide.find": "#a2dfc3e306",
         "c9.ide.find.infiles": "#488db22ee1",
         "c9.ide.find.replace": "#47a84af707",
-        "c9.ide.run.debug": "#3a13207ef8",
+        "c9.ide.run.debug": "#b7ad699bff",
         "c9.automate": "#47e2c429c9",
         "c9.ide.ace.emmet": "#6dc4585e02",
-        "c9.ide.ace.gotoline": "#a8ff07c8f4",
+        "c9.ide.ace.gotoline": "#dcbe58d549",
         "c9.ide.ace.keymaps": "#334a65192f",
         "c9.ide.ace.repl": "#4b88a85b7b",
         "c9.ide.ace.split": "#0ae0151c78",
@@ -120,7 +120,7 @@
         "c9.ide.theme.flat": "#81dadeee55",
         "c9.ide.threewaymerge": "#229382aa0b",
         "c9.ide.undo": "#b028bcb4d5",
-        "c9.ide.upload": "#a3da59803d",
+        "c9.ide.upload": "#428de5c35b",
         "c9.ide.welcome": "#5b86c44e92",
         "c9.ide.guide": "#df7c89e449"
     }
diff --git a/plugins/c9.ide.browsersupport/browsersupport.js b/plugins/c9.ide.browsersupport/browsersupport.js
deleted file mode 100644
index 48e6dac9..00000000
--- a/plugins/c9.ide.browsersupport/browsersupport.js
+++ /dev/null
@@ -1,118 +0,0 @@
-define(function(require, exports, module) {
-    "use strict";
-    
-    main.consumes = ["Plugin"];
-    main.provides = ["browsersupport"];
-    return main;
-
-    function main(options, imports, register) {
-        var Plugin = imports.Plugin;
-        
-        require("ace/lib/es5-shim");
-        require("ace/lib/es6-shim");
-        var useragent = require("ace/lib/useragent");
-        var dom = require("ace/lib/dom");
-        
-        if (useragent.isGecko)
-            dom.addCssClass(document.body, "ua_gecko");
-        else if (useragent.isWebkit)
-            dom.addCssClass(document.body, "ua_webkit");
-        else if (useragent.isIE)
-            dom.addCssClass(document.body, "ua_ie");
-
-        function getIEVersion() {
-            return useragent.isIE;
-        }
-
-        var plugin = new Plugin("Ajax.org", main.consumes);
-        
-        /**
-         * Browser compatibility support.
-         */
-        plugin.freezePublicAPI({
-            /**
-             * Gets Internet Explorer's major version, e.g. 10,
-             * or returns null if a different browser is used.
-             * 
-             * @return {Number}
-             */
-            getIEVersion: getIEVersion
-        });
-        register(null, { browsersupport: plugin });
-    }
-});
-
-// Support __defineGetter__ et al. on IE9
-// (always triggers when packed)
-try {
-   if (!Object.prototype.__defineGetter__ &&
-        Object.defineProperty({},"x",{get: function(){return true}}).x) {
-        
-        // Setter    
-        Object.defineProperty(
-            Object.prototype, 
-            "__defineSetter__",
-            {
-                enumerable: false, 
-                configurable: true,
-                value: function(name,func) {
-                    Object.defineProperty(this,name,{set:func,enumerable: true,configurable: true});
-                    
-                    // Adding the property to the list (for __lookupSetter__)
-                    if (!this.setters) this.setters = {};
-                    this.setters[name] = func;
-                }
-            }
-        );
-        
-        // Lookupsetter
-        Object.defineProperty(
-            Object.prototype, 
-            "__lookupSetter__",
-            {
-                enumerable: false, 
-                configurable: true,
-                value: function(name) {
-                    if (!this.setters) return false;
-                    return this.setters[name];
-                }
-            }
-        );
-        
-        // Getter    
-        Object.defineProperty(
-            Object.prototype, 
-            "__defineGetter__",
-            {
-                enumerable: false, 
-                configurable: true,
-                value: function(name,func) {
-                    Object.defineProperty(this,name,{get:func,enumerable: true,configurable: true});
-                    
-                    // Adding the property to the list (for __lookupSetter__)
-                    if (!this.getters) this.getters = {};
-                    this.getters[name] = func;
-                }
-            }
-        );
-        
-        // Lookupgetter
-        Object.defineProperty(
-            Object.prototype, 
-            "__lookupGetter__",
-            {
-                enumerable: false, 
-                configurable: true,
-                value: function(name) {
-                    if (!this.getters) return false;
-                    return this.getters[name];
-                }
-            }
-        );
-        
-   }
-} catch (defPropException) {
-   // Forget about it
-}
-
-
diff --git a/plugins/c9.ide.plugins/manager.js b/plugins/c9.ide.plugins/manager.js
index 1eceb48c..4c338003 100644
--- a/plugins/c9.ide.plugins/manager.js
+++ b/plugins/c9.ide.plugins/manager.js
@@ -77,7 +77,7 @@ define(function(require, exports, module) {
             "c9.ide.console":1,"c9.ide.editors":1,"c9.ide.dialog.common":1,
             "c9.ide.dialog.file":1,"c9.ide.dialog.login":1,"c9.ide.errorhandler":1,
             "c9.ide.help":1,"c9.ide.keys":1,"c9.ide.restore":1,"c9.ide.watcher":1,
-            "c9.ide.tree":1, "c9.ide.info":1, "c9.ide.browsersupport":1,
+            "c9.ide.tree":1, "c9.ide.info":1,
             "c9.ide.layout.classic":1, "c9.ide.terminal":1, "c9.ide.ace":1,
             "c9.ide.clipboard":1, "c9.nodeapi":1
         };

From 6d9a77b72015b834b0f3f18b9553afd644f977b6 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 3 Jun 2016 16:51:33 +0200
Subject: [PATCH 127/303] c9-auto-bump 3.1.2646

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 83666338..19f097d5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2645",
+    "version": "3.1.2646",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From c073b8247277e554abe25be82f1e5ca33e8d3163 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 3 Jun 2016 21:03:43 +0400
Subject: [PATCH 128/303] update beautifyjs

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 19f097d5..0a2203c9 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
         "c9.ide.configuration": "#a936df26bb",
         "c9.ide.dialog.wizard": "#7667ec79a8",
         "c9.ide.fontawesome": "#781602c5d8",
-        "c9.ide.format": "#5ec97fb083",
+        "c9.ide.format": "#f99082ff4c",
         "c9.ide.help.support": "#932fbb3743",
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#76c8e3213a",

From 0175a9d88d4075616e8859f6f3c3ee1fdc8ccbff Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Sun, 5 Jun 2016 23:00:50 +0200
Subject: [PATCH 129/303] unhandled error doesn't make new engineio reconnect

---
 node_modules/kaefer/lib/reliable_socket.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/node_modules/kaefer/lib/reliable_socket.js b/node_modules/kaefer/lib/reliable_socket.js
index 0a01ba42..8743a096 100644
--- a/node_modules/kaefer/lib/reliable_socket.js
+++ b/node_modules/kaefer/lib/reliable_socket.js
@@ -128,14 +128,7 @@ ReliableSocket.prototype.onMessage = function(msg) {
         this.emit(msg.t, msg);
     }
     else if (msg.d) {
-        try {
-            this.emit("message", msg.d);
-        } catch (e) {
-            console.error(e.stack);
-            // Don't let engine.io catch this, it'll consider it a parser error,
-            // making us reconnect
-            setTimeout(function() { throw e; });
-        }
+        this.emit("message", msg.d);
     }
 };
 

From ff92b4e3d84c01447519bbb5e584c6c0e66093ec Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 6 Jun 2016 01:07:20 +0400
Subject: [PATCH 130/303] fix monitor test

---
 package.json                             | 2 +-
 plugins/c9.ide.terminal/terminal_test.js | 2 +-
 plugins/c9.vfs.standalone/www/test.js    | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 19f097d5..5cfdcee4 100644
--- a/package.json
+++ b/package.json
@@ -114,7 +114,7 @@
         "c9.ide.run.debug.xdebug": "#9956689819",
         "c9.ide.save": "#25a63f31e2",
         "c9.ide.scm": "#637a68cd04",
-        "c9.ide.terminal.monitor": "#affa33572f",
+        "c9.ide.terminal.monitor": "#5a6a54ce24",
         "c9.ide.test": "#102942ae4e",
         "c9.ide.test.mocha": "#38151a98c3",
         "c9.ide.theme.flat": "#81dadeee55",
diff --git a/plugins/c9.ide.terminal/terminal_test.js b/plugins/c9.ide.terminal/terminal_test.js
index aa4c2220..3c967744 100644
--- a/plugins/c9.ide.terminal/terminal_test.js
+++ b/plugins/c9.ide.terminal/terminal_test.js
@@ -13,7 +13,6 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root"], function (arc
             debug: true,
             hosted: true,
             local: false,
-            davPrefix: "/"
         },
         
         "plugins/c9.core/ext",
@@ -127,6 +126,7 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root"], function (arc
                     
                     // Kill connection
                     session.pty.kill();
+                    session.doc.editor.focus();
                 });
                 
                 it.skip('should reconnect when the session has been lost', function(done) {
diff --git a/plugins/c9.vfs.standalone/www/test.js b/plugins/c9.vfs.standalone/www/test.js
index 73255d54..3063fc79 100644
--- a/plugins/c9.vfs.standalone/www/test.js
+++ b/plugins/c9.vfs.standalone/www/test.js
@@ -530,6 +530,12 @@ require([
                 x.unregister = function(){};
                 return x;
             })(),
+            "terminal.monitor.message_view": (function(){
+                var x = new EventEmitter();
+                x.show = function(){};
+                x.hide = function(){};
+                return x;
+            })()
         });
     };
     

From 581cd51fca9015f2e094badd47c41077edbac478 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 6 Jun 2016 02:22:31 +0400
Subject: [PATCH 131/303] fix regression in vfs.ping

---
 plugins/c9.vfs.client/vfs.ping.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/c9.vfs.client/vfs.ping.js b/plugins/c9.vfs.client/vfs.ping.js
index 05bdbc9c..380d42e1 100644
--- a/plugins/c9.vfs.client/vfs.ping.js
+++ b/plugins/c9.vfs.client/vfs.ping.js
@@ -61,7 +61,7 @@ define(function(require, exports, module) {
                 };
             }
 
-            if (!api) return callback(new Error("Client is offline"));
+            if (!api || !vfs.connection) return callback(new Error("Client is offline"));
             
             if (!vfs.isIdle())
                 return vfs.connection.once("message", ping.bind(null, callback));

From 7c55a315dd794f95d8b986577b7a49f92c5b0b90 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 6 Jun 2016 00:19:37 +0200
Subject: [PATCH 132/303] more robust handling of missing module errors

---
 .../architect-build/build_support/mini_require.js     |  2 ++
 plugins/c9.vfs.standalone/www/test.html               | 11 ++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/node_modules/architect-build/build_support/mini_require.js b/node_modules/architect-build/build_support/mini_require.js
index c04e9e77..19147352 100644
--- a/node_modules/architect-build/build_support/mini_require.js
+++ b/node_modules/architect-build/build_support/mini_require.js
@@ -309,6 +309,7 @@ define.undef = require.undef = function(module, recursive) {
     var path = require.toUrl(module, ".js");
     delete define.errors[module];
     delete define.loaded[module];
+    delete define.loading[module];
     delete define.modules[module];
     delete define.fetchedUrls[path];
 };
@@ -403,6 +404,7 @@ var loadScriptWithTag = function(path, id, callback) {
     };
     s.onerror = function(e) {
         processLoadQueue({
+            message: "Error loading script " + id  + ":" + path,
             id: id,
             path: path
         });
diff --git a/plugins/c9.vfs.standalone/www/test.html b/plugins/c9.vfs.standalone/www/test.html
index b4c1320e..10015f94 100644
--- a/plugins/c9.vfs.standalone/www/test.html
+++ b/plugins/c9.vfs.standalone/www/test.html
@@ -263,7 +263,7 @@
         }
         
         function getReport() {
-            return mocha.lastReport;
+            return mocha.lastReport || { failures: "didn't complete" };
         }
         
         function safeDisconnect(cb) {
@@ -382,7 +382,11 @@
             return !/text!/.test(x);
         });
         function cleanupRequireModules() {
-            Object.keys(define.modules).forEach(function(x) {
+            [].concat(
+                Object.keys(define.modules),
+                Object.keys(define.errors),
+                Object.keys(define.loading)
+            ).forEach(function(x) {
                 if (/text!/.test(x) || defaultModules.indexOf(x) != -1)
                     return;
                 if (/^ace|^treehugger|\/ctags\/ctags$/.test(x) && !/_test/.test(x))
@@ -390,12 +394,13 @@
                     
                 require.undef(x);
             });
+            define.fetchedUrls = Object.create(null);
         }
         if (require == requirejs) {
             require = function(a, b, c) {
                 if (!c && Array.isArray(a))
                     c = function(err) { 
-                        lastDone && lastDone(err.message); 
+                        lastDone && lastDone(err.message || err);
                     };
                 // workaround for sync minirequire behaviour
                 var bt = b && function() {

From d13dc1fd3d670d1c5c38fa02451b481e13264e11 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 6 Jun 2016 03:21:00 +0400
Subject: [PATCH 133/303] handle broken colors in theme importer

---
 node_modules/ace/lib/ace/ext/modelist.js | 2 +-
 node_modules/ace/tool/tmtheme.js         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/node_modules/ace/lib/ace/ext/modelist.js b/node_modules/ace/lib/ace/ext/modelist.js
index 13c1170f..a269e7a7 100644
--- a/node_modules/ace/lib/ace/ext/modelist.js
+++ b/node_modules/ace/lib/ace/ext/modelist.js
@@ -137,7 +137,7 @@ var supportedModes = {
     Protobuf:    ["proto"],
     Python:      ["py"],
     R:           ["r"],
-    Razor:       ["cshtml"],
+    Razor:       ["cshtml|asp"],
     RDoc:        ["Rd"],
     RHTML:       ["Rhtml"],
     RST:         ["rst"],
diff --git a/node_modules/ace/tool/tmtheme.js b/node_modules/ace/tool/tmtheme.js
index c784eec7..11e80e38 100755
--- a/node_modules/ace/tool/tmtheme.js
+++ b/node_modules/ace/tool/tmtheme.js
@@ -176,6 +176,8 @@ function luma(color) {
 }
 
 function parseColor(color) {
+    if (color[0] != "#" && color.match(/^[a-f\d]+$/i))
+        color = "#" + color;
     if (color.length == 4)
         color = color.replace(/[a-fA-F\d]/g, "$&$&");
     if (color.length == 7)

From a4d6876baa726fb52d2e88bdd375a9933f79e846 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 6 Jun 2016 04:42:53 +0400
Subject: [PATCH 134/303] fix another error in terminal test

---
 plugins/c9.ide.terminal/terminal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/c9.ide.terminal/terminal.js b/plugins/c9.ide.terminal/terminal.js
index cbb4e66c..d6c3c164 100644
--- a/plugins/c9.ide.terminal/terminal.js
+++ b/plugins/c9.ide.terminal/terminal.js
@@ -645,7 +645,7 @@ define(function(require, exports, module) {
                     if (!e && data) {
                         session.terminal.setOutputHistory(data, true);
                         session.getStatus({clients: true}, function(e, status) {
-                            if (e) return;
+                            if (e || !status) return;
                             if (status.clients && status.clients.length > 0) {
                                 var terminal = session.terminal;
                                 var rows = terminal.rows;

From d5b07de282c99be4f7d5b47ba1f970cf50bfda36 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 6 Jun 2016 09:26:39 +0200
Subject: [PATCH 135/303] c9-auto-bump 3.1.2647

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 19f097d5..87ec0a83 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2646",
+    "version": "3.1.2647",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 76b724d930ffabc59cfe3cc3303ad7a64b631e90 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 6 Jun 2016 11:00:23 +0200
Subject: [PATCH 136/303] c9-auto-bump 3.1.2648

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9cbc7298..f62be1c2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2647",
+    "version": "3.1.2648",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 86f4d07f783c76b41fad4299ee0ee23946d1a018 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 6 Jun 2016 11:05:02 +0200
Subject: [PATCH 137/303] c9-auto-bump 3.1.2649

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e881734c..86174ede 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2648",
+    "version": "3.1.2649",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 3085279f88502673f2e2560b01ade24c53c92277 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 6 Jun 2016 12:18:46 +0200
Subject: [PATCH 138/303] c9-auto-bump 3.1.2650

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 86174ede..3ac273ef 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2649",
+    "version": "3.1.2650",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From ff6fffcd90fb2c81c1dc6fb5558a564d023ae163 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 6 Jun 2016 16:16:37 +0200
Subject: [PATCH 139/303] c9-auto-bump 3.1.2651

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3ac273ef..4a611127 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2650",
+    "version": "3.1.2651",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 88e5dfa70f8f10d23f96961302ed5225969c0510 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Mon, 6 Jun 2016 10:29:35 -0400
Subject: [PATCH 140/303] Revert "VFS Fix collab code reverting for unsaved
 files"

---
 package.json                  |  2 +-
 plugins/c9.ide.watcher/gui.js | 42 +++++++++++++++++------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 4a611127..516f76e7 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "c9.ide.language.javascript.infer": "#b9c2e4bdb8",
         "c9.ide.language.jsonalyzer": "#72954f8da1",
         "c9.ide.language.codeintel": "#4e0a272229",
-        "c9.ide.collab": "#4885f8e5a3",
+        "c9.ide.collab": "#24e28024d7",
         "c9.ide.local": "#9169fec157",
         "c9.ide.find": "#a2dfc3e306",
         "c9.ide.find.infiles": "#488db22ee1",
diff --git a/plugins/c9.ide.watcher/gui.js b/plugins/c9.ide.watcher/gui.js
index 7e1979e8..e1330ca4 100644
--- a/plugins/c9.ide.watcher/gui.js
+++ b/plugins/c9.ide.watcher/gui.js
@@ -1,7 +1,7 @@
 define(function(require, exports, module) {
     main.consumes = [
         "Plugin", "fs", "settings", "preferences", "watcher", "tabManager", 
-        "save", "dialog.question", "dialog.filechange", "threewaymerge", "collab"
+        "save", "dialog.question", "dialog.filechange", "threewaymerge"
     ];
     main.provides = ["watcher.gui"];
     return main;
@@ -17,7 +17,6 @@ define(function(require, exports, module) {
         var question = imports["dialog.question"];
         var filechange = imports["dialog.filechange"];
         var threeWayMerge = imports.threewaymerge.merge;
-        var collab = imports.collab;
         
         var collabEnabled = options.collab;
 
@@ -120,33 +119,33 @@ define(function(require, exports, module) {
     
             // Hook watcher events
             
-            // A change event sent from the watcher plugin
+            // Update a file
             watcher.on("change", function(e) {
                 var tab = tabManager.findTab(e.path);
                 if (tab) {
-                    if (collabEnabled && tab.editorType == "ace") {
-                        /* If the lastChange (added by collab) was greater than 1 second ago set up a watch 
-                            To ensure that collab makes this change, if not report an error. The lastChange
-                            check is to avoid a race condition if collab updates before this function runs */
-                        if (!tab.meta.$lastCollabChange || tab.meta.$lastCollabChange < (Date.now() - 1000)) {
-                            if (tab.meta.$collabChangeRegistered) {
-                                clearTimeout(tab.meta.$collabChangeRegistered);
-                            }
-                        }
-                        
-                        return false;
-                    }
+                    // If collab picks this up and handles the change it will return false 
+                    if (emit("docChange", {tab: tab}) === false)
+                        return;
                     
                     addChangedTab(tab, e.type === "change");
                 }
             });
             
-            collab.on("change", function (e) {
-                var tab = tabManager.findTab(e.path);
-                if (tab) {
-                    addChangedTab(tab, e.type === "change");
-                }
-            });
+            // Directory watcher is not needed if the normal watcher works
+            // watcher.on("directory", function(e) {
+            //     var base = e.path;
+            //     var files = e.files;
+            // 
+            //     // Rename all tabs
+            //     tabManager.getTabs().forEach(function(tab) {
+            //         if (tab.path && tab.path.indexOf(base) == 0) {
+            //             // If the file is gone, lets notify the user
+            //             if (files.indexOf(tab.path) == -1) {
+            //                 resolveFileDelete(tab);
+            //             }
+            //         }
+            //     });
+            // });
             
             watcher.on("delete", function(e) {
                 var tab = tabManager.findTab(e.path);
@@ -294,6 +293,7 @@ define(function(require, exports, module) {
         function automerge(tab, data) {
             if (!settings.getBool("user/general/@automerge"))
                 return false;
+                
             return merge(tab, data);
         }
         

From c75cb907b7b25a0ec2f420144f4cab239154c0f4 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 6 Jun 2016 16:30:39 +0200
Subject: [PATCH 141/303] c9-auto-bump 3.1.2652

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 516f76e7..e05400c5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2651",
+    "version": "3.1.2652",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 0dc707ec6556bad9e64f6f20a0f4fcd2be9f1227 Mon Sep 17 00:00:00 2001
From: Chris Brown <cbrown@fico.com>
Date: Mon, 6 Jun 2016 15:35:12 +0100
Subject: [PATCH 142/303] Use escape instead of encodeURI and
 encodeURIComponent, so that problematic filename characters are escaped
 correctly

---
 plugins/c9.vfs.client/vfs_client.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/c9.vfs.client/vfs_client.js b/plugins/c9.vfs.client/vfs_client.js
index eade1caf..51d7736c 100644
--- a/plugins/c9.vfs.client/vfs_client.js
+++ b/plugins/c9.vfs.client/vfs_client.js
@@ -193,12 +193,13 @@ define(function(require, exports, module) {
                 extraPaths = path;
                 path = path[0];
                 extraPaths = "," + extraPaths.map(function(p) {
-                    return p[0] == path[0] && p != path ? encodeURI(p).replace(/,/g, "%2C") : "";
+                    return p[0] == path[0] && p != path ? escape(p) : "";
                 }).filter(Boolean).join(",");
             }
             window.open(vfsUrl(path) + extraPaths
                 + "?download" 
-                + (filename ? "=" + encodeURIComponent(filename) : "")
+                // Escape '+', otherwise it gets interpreted as a space.
+                + (filename ? "=" + escape(filename) : "").replace(/\+/g, "%2B")
                 + (isfile ? "&isfile=1" : ""));
         }
 

From dbf1d72d1c3bacdf85feaa9abb5eaeed86149fbe Mon Sep 17 00:00:00 2001
From: Chris Brown <cbrown@fico.com>
Date: Mon, 6 Jun 2016 15:36:46 +0100
Subject: [PATCH 143/303] Use escape instead of encodeURIComponent so that
 download filenames are encoded correctly (e.g., filenames containing a single
 quote)

---
 plugins/c9.vfs.server/download.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/c9.vfs.server/download.js b/plugins/c9.vfs.server/download.js
index ec26e2ca..c064dce6 100644
--- a/plugins/c9.vfs.server/download.js
+++ b/plugins/c9.vfs.server/download.js
@@ -44,7 +44,7 @@ define(function(require, exports, module) {
                     filename += (paths.length > 1 ? "[+" + (paths.length - 1) + "]"  : "") + ".tar.gz";
                 }
             }
-            var filenameHeader = "attachment; filename*=utf-8''" + encodeURIComponent(filename);
+            var filenameHeader = "attachment; filename*=utf-8''" + escape(filename);
 
             var process;
             req.on("close", function() {

From 6440ef1eb86fd646856fd1a3b1c659a74c180be1 Mon Sep 17 00:00:00 2001
From: Chris Brown <cbrown@fico.com>
Date: Mon, 6 Jun 2016 15:37:32 +0100
Subject: [PATCH 144/303] Escape the filename arguments to zip and tar
 correctly on Windows

---
 plugins/c9.vfs.server/download.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/plugins/c9.vfs.server/download.js b/plugins/c9.vfs.server/download.js
index c064dce6..5246be18 100644
--- a/plugins/c9.vfs.server/download.js
+++ b/plugins/c9.vfs.server/download.js
@@ -46,9 +46,9 @@ define(function(require, exports, module) {
             }
             var filenameHeader = "attachment; filename*=utf-8''" + escape(filename);
 
-            var process;
+            var proc;
             req.on("close", function() {
-                if (process) process.kill();
+                if (proc) proc.kill();
             });
             
             if (req.uri.query.isfile) {
@@ -113,22 +113,26 @@ define(function(require, exports, module) {
                 paths.forEach(function(path) {
                     if (!path) return;
                     path = Path.relative(cwd, path);
-                    // Single quote the path to escape unusual characters, and manually escape single quotes.
-                    path = "'" + path.replace(/'/, "'\\''") + "'";
+                    if (/win/.test(process.platform)) {
+                        // Quote the path to escape unusual characters and spaces.
+                        // NB: Double quotes are illegal within the actual path on Windows.
+                        path = '"' + path + '"';
+                    }
                     args.push(path);
                 });
 
                 vfs.spawn(executable, {
                     args: args,
-                    cwd: cwd
+                    cwd: cwd,
+                    windowsVerbatimArguments: true // Prevents Node from escaping the double quotes added above.
                 }, function (err, meta) {
                     if (err)
                         return next(err);
 
-                    process = meta.process;
+                    proc = meta.process;
 
                     // once we receive data on stdout pipe it to the response
-                    process.stdout.once("data", function (data) {
+                    proc.stdout.once("data", function (data) {
                         if (res.headerSent)
                             return;
                             
@@ -137,15 +141,15 @@ define(function(require, exports, module) {
                             "Content-Disposition": filenameHeader
                         });
                         res.write(data);
-                        process.stdout.pipe(res);
+                        proc.stdout.pipe(res);
                     });
             
                     var stderr = "";
-                    process.stderr.on("data", function (data) {
+                    proc.stderr.on("data", function (data) {
                         stderr += data;
                     });
 
-                    process.on("exit", function(code, signal) {
+                    proc.on("exit", function(code, signal) {
                         if (res.headerSent)
                             return;
                             

From 03e1f3a9c681dcfdfdc8d3d32aa077a494a47bf8 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 6 Jun 2016 17:09:55 +0200
Subject: [PATCH 145/303] c9-auto-bump 3.1.2653

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e05400c5..f607a51f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2652",
+    "version": "3.1.2653",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 1959ee08c56854815bd1679a45c7115791d19d9c Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 6 Jun 2016 17:11:56 +0200
Subject: [PATCH 146/303] c9-auto-bump 3.1.2654

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f607a51f..bde0c568 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2653",
+    "version": "3.1.2654",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 04ac2190eff8ace1cc4a987943c8c1c8b14457cd Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 6 Jun 2016 17:58:57 +0200
Subject: [PATCH 147/303] c9-auto-bump 3.1.2655

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bde0c568..994f5ef4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2654",
+    "version": "3.1.2655",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 74451d3d89d7fdf28e9eedb25b35a5c6fea2e0e3 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 7 Jun 2016 09:25:17 +0200
Subject: [PATCH 148/303] c9-auto-bump 3.1.2656

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 994f5ef4..d79df037 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2655",
+    "version": "3.1.2656",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 8f9e5a2b8136c5f716b2dd4168ed84122a94329d Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 7 Jun 2016 12:00:30 +0200
Subject: [PATCH 149/303] c9-auto-bump 3.1.2657

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d79df037..ad4d8903 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2656",
+    "version": "3.1.2657",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From f3b9781a7e15e7691340762649a448a4398e25b4 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 7 Jun 2016 12:41:07 +0200
Subject: [PATCH 150/303] c9-auto-bump 3.1.2658

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ad4d8903..c120783a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2657",
+    "version": "3.1.2658",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From ef4f3a279c68b669d6773223e0f6eeef76ab0829 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Tue, 7 Jun 2016 11:53:41 +0000
Subject: [PATCH 151/303] Relicense v8debugger to MIT

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1a7d8009..77390b37 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     ],
     "c9plugins": {
         "c9.ide.language": "#79bcb2fe06",
+        "c9.ide.language.core": "#undefined",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#3949510863",
         "c9.ide.language.html": "#22fdc74869",
@@ -75,7 +76,7 @@
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#bd34c29373",
         "c9.ide.find.replace": "#810ebf8bfb",
-        "c9.ide.run.debug": "#317feee072",
+        "c9.ide.run.debug": "#9aab72d646",
         "c9.automate": "#47e2c429c9",
         "c9.ide.ace.emmet": "#6dc4585e02",
         "c9.ide.ace.gotoline": "#a8ff07c8f4",

From 88d453e79d3c75a663e2665933329997fe1bd4d8 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Tue, 7 Jun 2016 11:58:21 +0000
Subject: [PATCH 152/303] Relicense assert.js

---
 node_modules/c9/assert.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/node_modules/c9/assert.js b/node_modules/c9/assert.js
index 905d9c82..0c4447e6 100644
--- a/node_modules/c9/assert.js
+++ b/node_modules/c9/assert.js
@@ -2,7 +2,7 @@
  * Cloud9 assertion support.
  *
  * @copyright 2011, Ajax.org B.V.
- * @license GPLv3 <http://www.gnu.org/licenses/gpl.txt>
+ * @license Apache2 <http://www.apache.org/licenses/LICENSE-2.0>
  */
 define(function(require, exports, module) {
         

From 81599ecae15b29631f5c0c77f52702b3c7dea394 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 7 Jun 2016 14:03:22 +0200
Subject: [PATCH 153/303] c9-auto-bump 3.1.2659

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c120783a..e8c3b902 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2658",
+    "version": "3.1.2659",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 3d5cbeb7bac779b017e267e9a63ed4c7a9342f9b Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 7 Jun 2016 14:29:12 +0200
Subject: [PATCH 154/303] c9-auto-bump 3.1.2660

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d936dead..d654ecff 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2659",
+    "version": "3.1.2660",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From d8dff02fcac916b761abe0d843efe361a61e6bd0 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 7 Jun 2016 15:22:02 +0200
Subject: [PATCH 155/303] c9-auto-bump 3.1.2661

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d654ecff..aa01642e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2660",
+    "version": "3.1.2661",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 6aa8a8c4ab16f69dfc93f57eee7f48bee30adf66 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Tue, 7 Jun 2016 13:24:10 +0000
Subject: [PATCH 156/303] Change license to MIT

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index aa01642e..34588004 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "c9.ide.language.core": "#2945e91cb6",
         "c9.ide.language.css": "#46ad561506",
         "c9.ide.language.generic": "#b47cbe58f9",
-        "c9.ide.language.html": "#6ecb73a17b",
+        "c9.ide.language.html": "#8e990755bb",
         "c9.ide.language.html.diff": "#7d6cecfb90",
         "c9.ide.language.javascript": "#b82f16e56a",
         "c9.ide.language.javascript.immediate": "#82c426dbca",

From 1cbb19061b3d877ded5f1e640c3f033087d4788c Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 7 Jun 2016 15:31:24 +0200
Subject: [PATCH 157/303] c9-auto-bump 3.1.2662

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index aa01642e..3c2a63e8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2661",
+    "version": "3.1.2662",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From f85c999e44b0dbe98b20d32e827a21d82f2f1ac6 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 7 Jun 2016 15:59:54 +0200
Subject: [PATCH 158/303] c9-auto-bump 3.1.2663

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3c2a63e8..3fdc7a06 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2662",
+    "version": "3.1.2663",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 0e02090d86c050a6d550c6a9587d23bcf483d505 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 7 Jun 2016 16:52:28 +0200
Subject: [PATCH 159/303] c9-auto-bump 3.1.2664

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3fdc7a06..d61b6a41 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2663",
+    "version": "3.1.2664",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 0a98111f62793e5670b65316507118fcabdf254c Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Tue, 7 Jun 2016 19:20:46 +0400
Subject: [PATCH 160/303] include shim in worker package

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d61b6a41..433da068 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     ],
     "c9plugins": {
         "c9.ide.language": "#f62951109c",
-        "c9.ide.language.core": "#2945e91cb6",
+        "c9.ide.language.core": "#10a225e77d",
         "c9.ide.language.css": "#46ad561506",
         "c9.ide.language.generic": "#b47cbe58f9",
         "c9.ide.language.html": "#6ecb73a17b",

From d5efc4d5e1f83c1e66981dac18df6cb109809f39 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Tue, 7 Jun 2016 19:41:36 +0400
Subject: [PATCH 161/303] fix download_test failing due to busy port

---
 plugins/c9.vfs.server/download_test.js | 78 ++++++++++++++------------
 1 file changed, 41 insertions(+), 37 deletions(-)

diff --git a/plugins/c9.vfs.server/download_test.js b/plugins/c9.vfs.server/download_test.js
index ab170687..1eeef768 100755
--- a/plugins/c9.vfs.server/download_test.js
+++ b/plugins/c9.vfs.server/download_test.js
@@ -19,6 +19,7 @@ var execFile = require('child_process').execFile;
 
 describe(__filename, function(){
     this.timeout(4000);
+    var base;
 
     beforeEach(function(next) {
         var that = this;
@@ -35,6 +36,7 @@ describe(__filename, function(){
                 registerExtension: function() {  }
             }
         }, function(err, api) {
+            assert.equal(err, null);
             var download = api["vfs.download"].download;
             that.server = http.createServer(function(req, res, next) {
                 req.uri = urlParse(req.url, true);
@@ -43,7 +45,16 @@ describe(__filename, function(){
                     assert.fail(err);
                 });
             });
-            that.server.listen(8787, "0.0.0.0", next);
+            function tryNext(retries, err) {
+                if (retries < 0) return next(err);
+                var port = 20000 + Math.round(Math.random() * 20000);
+                base = "http://localhost:" + port;
+                that.server.listen(port, "localhost", function() {
+                    if (err) return tryNext(retries - 1, err);
+                    next();
+                });
+            }
+            tryNext(4);
         });
     });
 
@@ -55,10 +66,10 @@ describe(__filename, function(){
     
         it("should download as tar", function(next) {
             tmp.dir({unsafeCleanup: true}, function(err, path) {
-                path = path.replace(/\w:/, '');
-                var filename = path + "/download.tar.gz";
-                var file = fs.createWriteStream(filename);
-                http.get("http://localhost:8787/?download=download.tar.gz", function(res) {
+                assert.equal(err, null);
+                var filename = "download.tar.gz";
+                var file = fs.createWriteStream(path + "/" + filename);
+                http.get(base + "/?download=download.tar.gz", function(res) {
                     assert.equal(res.headers["content-type"], "application/x-gzip");
                     assert.equal(res.headers["content-disposition"], "attachment; filename*=utf-8''download.tar.gz");
     
@@ -80,12 +91,11 @@ describe(__filename, function(){
     
         it("should download sub directory as tar", function(next) {
             tmp.dir({unsafeCleanup: true}, function(err, path) {
-                path = path.replace(/\w:/, '');
                 assert.equal(err, null);
                 
-                var filename = path + "/download.tar.gz";
-                var file = fs.createWriteStream(filename);
-                http.get("http://localhost:8787/test?download=download.tar.gz", function(res) {
+                var filename = "download.tar.gz";
+                var file = fs.createWriteStream(path + "/" + filename);
+                http.get(base + "/test?download=download.tar.gz", function(res) {
                     res.pipe(file);
                     
                     res.on("end", function() {
@@ -104,12 +114,11 @@ describe(__filename, function(){
     
         it("should download without specifying a name", function(next) {
             tmp.dir({unsafeCleanup: true}, function(err, path) {
-                path = path.replace(/\w:/, '');
                 assert.equal(err, null);
                 
-                var filename = path + "/download.tar.gz";
-                var file = fs.createWriteStream(filename);
-                http.get("http://localhost:8787/test?download", function(res) {
+                var filename = "download.tar.gz";
+                var file = fs.createWriteStream(path + "/" + filename);
+                http.get(base + "/test?download", function(res) {
                     assert.equal(res.headers["content-type"], "application/x-gzip");
                     assert.equal(res.headers["content-disposition"], "attachment; filename*=utf-8''test.tar.gz");
                     
@@ -131,12 +140,11 @@ describe(__filename, function(){
 
         it("should download several files in same directory as tar", function(next) {
             tmp.dir({unsafeCleanup: true}, function(err, path) {
-                path = path.replace(/\w:/, '');
                 assert.equal(err, null);
 
-                var filename = path + "/download.tar.gz";
-                var file = fs.createWriteStream(filename);
-                http.get("http://localhost:8787/test/dir2/testdata2a.txt,/test/dir2/testdata2b.txt?download=download.tar.gz", function(res) {
+                var filename = "download.tar.gz";
+                var file = fs.createWriteStream(path + "/" + filename);
+                http.get(base + "/test/dir2/testdata2a.txt,/test/dir2/testdata2b.txt?download=download.tar.gz", function(res) {
                     res.pipe(file);
                     res.on("end", function() {
                         execFile("tar", ["-zxvf", filename], {cwd: path}, function(err) {
@@ -158,12 +166,11 @@ describe(__filename, function(){
 
         it("should download several files in different directories as tar", function(next) {
             tmp.dir({unsafeCleanup: true}, function(err, path) {
-                path = path.replace(/\w:/, '');
                 assert.equal(err, null);
 
-                var filename = path + "/download.tar.gz";
-                var file = fs.createWriteStream(filename);
-                http.get("http://localhost:8787/test/dir1/testdata1.txt,/test/dir2/testdata2a.txt?download=download.tar.gz", function(res) {
+                var filename = "download.tar.gz";
+                var file = fs.createWriteStream(path + "/" + filename);
+                http.get(base + "/test/dir1/testdata1.txt,/test/dir2/testdata2a.txt?download=download.tar.gz", function(res) {
                     res.pipe(file);
                     res.on("end", function() {
                         execFile("tar", ["-zxvf", filename], {cwd: path}, function(err) {
@@ -185,10 +192,10 @@ describe(__filename, function(){
 
         it("should download as zip", function(next) {
             tmp.dir({unsafeCleanup: true}, function(err, path) {
-                path = path.replace(/\w:/, '');
-                var filename = path + "/download.zip";
-                var file = fs.createWriteStream(filename);
-                http.get("http://localhost:8787/?download=download.zip", function(res) {
+                assert.equal(err, null);
+                var filename = "download.zip";
+                var file = fs.createWriteStream(path + "/" + filename);
+                http.get(base + "/?download=download.zip", function(res) {
                     assert.equal(res.headers["content-type"], "application/zip");
                     assert.equal(res.headers["content-disposition"], "attachment; filename*=utf-8''download.zip");
 
@@ -210,12 +217,11 @@ describe(__filename, function(){
 
         it("should download sub directory as zip", function(next) {
             tmp.dir({unsafeCleanup: true}, function(err, path) {
-                path = path.replace(/\w:/, '');
                 assert.equal(err, null);
 
-                var filename = path + "/download.zip";
-                var file = fs.createWriteStream(filename);
-                http.get("http://localhost:8787/test?download=download.zip", function(res) {
+                var filename = "download.zip";
+                var file = fs.createWriteStream(path + "/" + filename);
+                http.get(base + "/test?download=download.zip", function(res) {
                     res.pipe(file);
 
                     res.on("end", function() {
@@ -234,12 +240,11 @@ describe(__filename, function(){
 
         it("should download several files in same directory as zip", function(next) {
             tmp.dir({unsafeCleanup: true}, function(err, path) {
-                path = path.replace(/\w:/, '');
                 assert.equal(err, null);
 
-                var filename = path + "/download.zip";
-                var file = fs.createWriteStream(filename);
-                http.get("http://localhost:8787/test/dir2/testdata2a.txt,/test/dir2/testdata2b.txt?download=download.zip", function(res) {
+                var filename = "download.zip";
+                var file = fs.createWriteStream(path + "/" + filename);
+                http.get(base + "/test/dir2/testdata2a.txt,/test/dir2/testdata2b.txt?download=download.zip", function(res) {
                     res.pipe(file);
                     res.on("end", function() {
                         execFile("unzip", [filename], {cwd: path}, function(err) {
@@ -261,12 +266,11 @@ describe(__filename, function(){
 
         it("should download several files in different directories as zip", function(next) {
             tmp.dir({unsafeCleanup: true}, function(err, path) {
-                path = path.replace(/\w:/, '');
                 assert.equal(err, null);
 
-                var filename = path + "/download.zip";
-                var file = fs.createWriteStream(filename);
-                http.get("http://localhost:8787/test/dir1/testdata1.txt,/test/dir2/testdata2a.txt?download=download.zip", function(res) {
+                var filename = "download.zip";
+                var file = fs.createWriteStream(path + "/" + filename);
+                http.get(base + "/test/dir1/testdata1.txt,/test/dir2/testdata2a.txt?download=download.zip", function(res) {
                     res.pipe(file);
                     res.on("end", function() {
                         execFile("unzip", [filename], {cwd: path}, function(err) {

From 79e3595b03c57c648c7dee395667ed5f2783c2e2 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 7 Jun 2016 19:12:42 +0200
Subject: [PATCH 162/303] c9-auto-bump 3.1.2665

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 433da068..58d47e88 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2664",
+    "version": "3.1.2665",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 03297d21cf3db9b0d5f6e1faab5915a111a4587e Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 7 Jun 2016 20:26:09 +0200
Subject: [PATCH 163/303] c9-auto-bump 3.1.2666

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 56d93808..04d6b8c0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2665",
+    "version": "3.1.2666",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 1fe1ef93fbe5a02aa37abe608c32fe938de3c9b5 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 8 Jun 2016 12:10:09 +0200
Subject: [PATCH 164/303] c9-auto-bump 3.1.2667

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 04d6b8c0..4494a73a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2666",
+    "version": "3.1.2667",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From b1d0f9f247fb3a9e7b882407b627fb04ed289e0a Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 8 Jun 2016 14:10:43 +0200
Subject: [PATCH 165/303] c9-auto-bump 3.1.2668

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4494a73a..63a6d093 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2667",
+    "version": "3.1.2668",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 38f7c8399ea1f5a170c86c1f1577ed19b3f92b66 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Wed, 8 Jun 2016 13:17:29 +0000
Subject: [PATCH 166/303] fix error in cs50 workspace

---
 integrations/scripts/update.sh   | 75 ++++++++++++++++++++++++++++++++
 plugins/c9.ide.panels/panel.js   |  2 +-
 plugins/c9.ide.server/plugins.js | 14 ++++++
 plugins/c9.ide.tree/tree.js      |  2 +-
 4 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100755 integrations/scripts/update.sh

diff --git a/integrations/scripts/update.sh b/integrations/scripts/update.sh
new file mode 100755
index 00000000..4ad703e3
--- /dev/null
+++ b/integrations/scripts/update.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+set -e
+cd `dirname $0`/..
+
+NAME=$1
+URL=$2
+if [ "$NAME" == "" ]; then
+    echo "add name [url]"
+    exit 0
+fi
+
+if [ "$URL" == "" ]; then
+    URL=git@github.com:c9/$NAME.git
+fi
+
+if [ -d $NAME/.git ]; then
+    pushd $NAME
+    OLD_URL=$(git config --get remote.origin.url)
+    if [ "$OLD_URL" != "$URL" ]; then
+        echo "folder $NAME exists and points to $OLD_URL"
+        exit 1
+    fi
+    git fetch origin
+    popd
+else
+    mkdir -p $NAME
+    git clone $URL $NAME
+fi
+
+pushd $NAME
+HASH=$(git rev-parse --revs-only refs/remotes/origin/master)
+popd
+
+[ -f ./config.json ] || echo "{}" > ./config.json
+node -e '
+    var name = "'$NAME'";
+    var url = "'$URL'";
+    var hash = "'$HASH'"
+    var fs = require("fs");
+    
+    function updateJSON(path, fn) {
+        var text = fs.readFileSync(path, "utf8");
+        var indent = text.match(/^\s*(?=")/m);
+        indent = indent && indent[0] || 4;
+        console.log(indent)
+        var r = JSON.parse(text);
+        r = fn(r) || r;
+        text = JSON.stringify(r, null, indent) + "\n";
+        fs.writeFileSync(path, text, "utf8");
+    }
+    
+    updateJSON("./config.json", function(config) {
+        var packages = config.packages || (config.packages = {});
+        config.packages[name] = {
+            name: name,
+            hash: hash,
+            url: url,
+        };
+    });
+    updateJSON("../package.json", function(package) {
+        var deps = package.dependencies;
+        console.log(deps[name], hash)
+        deps[name] = deps[name].replace(/#[a-f\d]+$/i, "#" + hash)
+        console.log(deps[name], hash)
+    });
+    updateJSON("../npm-shrinkwrap.json", function(package) {
+        var deps = package.dependencies;
+        deps[name].from = deps[name].from.replace(/#[a-f\d]+$/i, "#" + hash);
+        deps[name].resolved = deps[name].resolved.replace(/#[a-f\d]+$/i, "#" + hash);
+    });
+'
+
+rm -rf "../node_modules/$NAME"
+ln -s `pwd`/$NAME `pwd`/../node_modules/$NAME
+
diff --git a/plugins/c9.ide.panels/panel.js b/plugins/c9.ide.panels/panel.js
index f1245f4b..f03e67d8 100644
--- a/plugins/c9.ide.panels/panel.js
+++ b/plugins/c9.ide.panels/panel.js
@@ -368,7 +368,7 @@ define(function(require, module, exports) {
                 /**
                  * @property {HTMLElement} container
                  */
-                get container(){ return aml.$ext; },
+                get container(){ return aml && aml.$ext; },
                 
                 /**
                  * The area that this panel is a part of.
diff --git a/plugins/c9.ide.server/plugins.js b/plugins/c9.ide.server/plugins.js
index e92571bd..57e6f333 100644
--- a/plugins/c9.ide.server/plugins.js
+++ b/plugins/c9.ide.server/plugins.js
@@ -96,6 +96,20 @@ define(function(require, exports, module) {
                     };
                 }));
                 
+                try {
+                    statics.addStatics(
+                        fs.readdirSync(__dirname + "/../../integrations/").map(function(plugin) {
+                            if (/^scripts$|\.(json|sh)$/.test(plugin)) 
+                                return;
+                            return {
+                                path: __dirname + "/../../integrations/" + plugin,
+                                mount: "/plugins/" + plugin
+                            };
+                        }).filter(Boolean)
+                    );
+                } catch(e) {
+                }
+                
                 statics.addStatics(fs.readdirSync(__dirname + "/../")
                     .filter(function(path) {
                         if (path in blacklist)
diff --git a/plugins/c9.ide.tree/tree.js b/plugins/c9.ide.tree/tree.js
index 80c92016..25b6be20 100644
--- a/plugins/c9.ide.tree/tree.js
+++ b/plugins/c9.ide.tree/tree.js
@@ -1102,7 +1102,7 @@ define(function(require, exports, module) {
                         expandedList[id] = node;
                     }
                 });
-                callback(err);
+                callback && callback(err);
                 tree.provider.on("changeScrollTop", scrollHandler);
                 
                 emit("refreshComplete");

From aa66b4629ce2b17c374a35f2a854db43d1e20ac5 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 8 Jun 2016 15:25:55 +0200
Subject: [PATCH 167/303] c9-auto-bump 3.1.2669

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 63a6d093..eb1f78ee 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2668",
+    "version": "3.1.2669",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 6a64b1be922deae5d31026cb77434e530b82d527 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 8 Jun 2016 15:44:52 +0200
Subject: [PATCH 168/303] c9-auto-bump 3.1.2670

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index eb1f78ee..218eea4c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2669",
+    "version": "3.1.2670",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 2f3f1ab52c0ca134e8e4363af578670c08f6920f Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 8 Jun 2016 20:10:21 +0200
Subject: [PATCH 169/303] c9-auto-bump 3.1.2671

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 218eea4c..47713b37 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2670",
+    "version": "3.1.2671",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 9fee4dc0b8279a3110ef9e4956155a693f1793c8 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 8 Jun 2016 20:10:35 +0200
Subject: [PATCH 170/303] c9-auto-bump 3.1.2672

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b7a539a7..1fb53006 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2671",
+    "version": "3.1.2672",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 700c8b7358e866970baedea6e6a5050288976ad7 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Wed, 8 Jun 2016 19:45:36 +0000
Subject: [PATCH 171/303] Catch errors where header contains invalid characters

---
 plugins/c9.preview/preview.handler.js | 44 ++++++++++++++++-----------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/plugins/c9.preview/preview.handler.js b/plugins/c9.preview/preview.handler.js
index 41539219..437f2690 100644
--- a/plugins/c9.preview/preview.handler.js
+++ b/plugins/c9.preview/preview.handler.js
@@ -162,24 +162,34 @@ define(function(require, exports, module) {
                 }
                 
                 debug("proxy call %s", url);
-                httpModule.get({
-                    path: parsedUrl.path,
-                    hostname: parsedUrl.hostname,
-                    port: parsedUrl.port,
-                    headers: req.headers
-                }, function(request) {
-                    if (request.statusCode >= 400)
-                        handleError(request);
-                    else if (isDir)
-                        serveListing(request);
-                    else if (request.headers["content-type"] == "text/html")
-                        serveHtml(request, parsedUrl.hostname, req);
-                    else
-                        serveFile(request);
-                }).on("error", function(err) {
+                try {
+                    httpModule.get({
+                        path: parsedUrl.path,
+                        hostname: parsedUrl.hostname,
+                        port: parsedUrl.port,
+                        headers: req.headers
+                    }, function(request) {
+                        if (request.statusCode >= 400)
+                            handleError(request);
+                        else if (isDir)
+                            serveListing(request);
+                        else if (request.headers["content-type"] == "text/html")
+                            serveHtml(request, parsedUrl.hostname, req);
+                        else
+                            serveFile(request);
+                    }).on("error", function(err) {
+                        metrics.increment("preview.failed.error");
+                        next(err); 
+                    });
+                } catch (e) {
+                    logError(new Error("httpModule.get threw unexpected error"), {
+                        message: e.message,
+                        url: url,
+                        headers: req.headers
+                    });
                     metrics.increment("preview.failed.error");
-                    next(err); 
-                });
+                    return next(new error.BadRequest(e.message));
+                }
                 
                 function handleError(request) {
                     var body = "";

From 129ea5eef6304d376b65616cd48021b08997ce96 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 9 Jun 2016 00:35:28 +0200
Subject: [PATCH 172/303] c9-auto-bump 3.1.2673

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1fb53006..167d2647 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2672",
+    "version": "3.1.2673",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 741aa033163be53a994f63a3b84d9b16b39a9273 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 9 Jun 2016 10:58:08 +0200
Subject: [PATCH 173/303] c9-auto-bump 3.1.2674

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 167d2647..b831b699 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2673",
+    "version": "3.1.2674",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 4f025eee4bbf619ece0f68a3f491acf59f016bfc Mon Sep 17 00:00:00 2001
From: Chris Brown <cbrown@fico.com>
Date: Thu, 9 Jun 2016 08:49:13 +0100
Subject: [PATCH 174/303] Workaround for an error in PhantomJS caused by a
 local variable having the same name as a getter

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b831b699..923b52a5 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "c9.ide.language.javascript.infer": "#b9c2e4bdb8",
         "c9.ide.language.jsonalyzer": "#a32369793c",
         "c9.ide.language.codeintel": "#4e0a272229",
-        "c9.ide.collab": "#24e28024d7",
+        "c9.ide.collab": "#e015881720",
         "c9.ide.local": "#9169fec157",
         "c9.ide.find": "#a2dfc3e306",
         "c9.ide.find.infiles": "#488db22ee1",

From 60e4de8ec9ea90e26fdafebb276d1f6165cd546d Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 9 Jun 2016 13:48:05 +0400
Subject: [PATCH 175/303] do not treat darwin as win32

---
 plugins/c9.vfs.server/download.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/c9.vfs.server/download.js b/plugins/c9.vfs.server/download.js
index 5246be18..b259713e 100644
--- a/plugins/c9.vfs.server/download.js
+++ b/plugins/c9.vfs.server/download.js
@@ -113,10 +113,10 @@ define(function(require, exports, module) {
                 paths.forEach(function(path) {
                     if (!path) return;
                     path = Path.relative(cwd, path);
-                    if (/win/.test(process.platform)) {
+                    if (process.platform == "win32") {
                         // Quote the path to escape unusual characters and spaces.
                         // NB: Double quotes are illegal within the actual path on Windows.
-                        path = '"' + path + '"';
+                        path = '"' + path.replace(/"/g, "") + '"';
                     }
                     args.push(path);
                 });

From afeb394caf0137624a37bec3641d72c3b9ebc193 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 9 Jun 2016 13:07:06 +0200
Subject: [PATCH 176/303] c9-auto-bump 3.1.2675

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 923b52a5..b0c98213 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2674",
+    "version": "3.1.2675",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 688a9fd943901fd7cff16697d2a4eab5f1a498b6 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 9 Jun 2016 13:07:28 +0200
Subject: [PATCH 177/303] c9-auto-bump 3.1.2676

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b0c98213..628d19fa 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2675",
+    "version": "3.1.2676",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From bebd5f1e03385726584ab8a61ab5348db9a65cd8 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 9 Jun 2016 14:57:22 +0200
Subject: [PATCH 178/303] c9-auto-bump 3.1.2677

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 628d19fa..0bcec43e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2676",
+    "version": "3.1.2677",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 5f4f3117bd62db4c3362a289a5fb12b48e53d627 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 9 Jun 2016 16:00:25 +0200
Subject: [PATCH 179/303] c9-auto-bump 3.1.2678

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0bcec43e..8012305f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2677",
+    "version": "3.1.2678",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From da939cebc8a15f43855fe05937f335d9a159760b Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 9 Jun 2016 16:01:12 +0200
Subject: [PATCH 180/303] c9-auto-bump 3.1.2679

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8012305f..6be3f822 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2678",
+    "version": "3.1.2679",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 8db21a51509575249a104e500420054dfc8947d1 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 9 Jun 2016 16:18:36 +0200
Subject: [PATCH 181/303] c9-auto-bump 3.1.2680

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6be3f822..a56f5e51 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2679",
+    "version": "3.1.2680",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From ff03b64d0934b4e41bd488ef2f60b3bfc9d12808 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 9 Jun 2016 17:25:04 +0200
Subject: [PATCH 182/303] c9-auto-bump 3.1.2681

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a56f5e51..ccfc7a45 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2680",
+    "version": "3.1.2681",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 7427b4505589344059691dc810edf97788e7ebff Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 9 Jun 2016 17:46:43 +0200
Subject: [PATCH 183/303] c9-auto-bump 3.1.2682

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ccfc7a45..cf8f6a97 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2681",
+    "version": "3.1.2682",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From d84af7f24c974aab96c24da82f2ff154e1d41b59 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 9 Jun 2016 17:54:19 +0200
Subject: [PATCH 184/303] c9-auto-bump 3.1.2683

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cf8f6a97..d1404af3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2682",
+    "version": "3.1.2683",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From c3334ae0301bf9c2ede06ad1025d07281c695cec Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 10 Jun 2016 03:53:25 +0200
Subject: [PATCH 185/303] c9-auto-bump 3.1.2684

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d1404af3..e31b5378 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2683",
+    "version": "3.1.2684",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From bdc3d23080f6df7756acdc1a6c8cc46a0b75a948 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 10 Jun 2016 10:42:02 +0200
Subject: [PATCH 186/303] c9-auto-bump 3.1.2685

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e31b5378..39e78bc2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2684",
+    "version": "3.1.2685",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From f227013479b6756dd8feb263842bc529e214284e Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 10 Jun 2016 12:12:27 +0200
Subject: [PATCH 187/303] c9-auto-bump 3.1.2686

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 39e78bc2..e0f56119 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2685",
+    "version": "3.1.2686",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 0df948fa17bd73b4e34050bbb177b09c7a0bc484 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 10 Jun 2016 14:03:31 +0200
Subject: [PATCH 188/303] c9-auto-bump 3.1.2687

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e0f56119..d8df3235 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2686",
+    "version": "3.1.2687",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 29939190a92c097ca8ad5133bbb90f333c4d6ce3 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 10 Jun 2016 14:27:50 +0200
Subject: [PATCH 189/303] c9-auto-bump 3.1.2688

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d8df3235..74353dce 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2687",
+    "version": "3.1.2688",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 66e53e41c5f007b0bbfbc83f31137c7eb44c49f3 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 10 Jun 2016 14:28:30 +0200
Subject: [PATCH 190/303] c9-auto-bump 3.1.2689

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 74353dce..32f0cc7e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2688",
+    "version": "3.1.2689",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From cf2c2a020d2731edd0b1b8df7232683a820e2471 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 10 Jun 2016 14:52:26 +0200
Subject: [PATCH 191/303] c9-auto-bump 3.1.2690

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 32f0cc7e..53c626d1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2689",
+    "version": "3.1.2690",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From d1ec02096b101da6f23be3b0dd170ac0b6751063 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 10 Jun 2016 14:53:33 +0200
Subject: [PATCH 192/303] c9-auto-bump 3.1.2691

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 53c626d1..fe75f0ce 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2690",
+    "version": "3.1.2691",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 0cf99bc382c243a6fb8f9f12c35ca66ed029e9a8 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 10 Jun 2016 14:58:30 +0200
Subject: [PATCH 193/303] c9-auto-bump 3.1.2692

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fe75f0ce..d6b5d12d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2691",
+    "version": "3.1.2692",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From e5b7b47487c63456d00f0b9d4b99d38178f35fa1 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 10 Jun 2016 15:08:36 +0200
Subject: [PATCH 194/303] c9-auto-bump 3.1.2693

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d6b5d12d..a5888e90 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2692",
+    "version": "3.1.2693",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 56ed63753b59f5987ca85849e54d018e738875d3 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 10 Jun 2016 15:31:38 +0200
Subject: [PATCH 195/303] c9-auto-bump 3.1.2694

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a5888e90..6c55e5c5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2693",
+    "version": "3.1.2694",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 67a9b53621c05f84163ba912e20c8909a79a7e89 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 10 Jun 2016 15:51:33 +0200
Subject: [PATCH 196/303] c9-auto-bump 3.1.2695

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6c55e5c5..19496930 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2694",
+    "version": "3.1.2695",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 3c76609cb8898a03f9f7714b78dbf1d9db77a35f Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 10 Jun 2016 16:14:29 +0200
Subject: [PATCH 197/303] c9-auto-bump 3.1.2696

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 19496930..687a4065 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2695",
+    "version": "3.1.2696",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 0edeec945e4e8c079e77c4d5a9c636e0e6433b0b Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 10 Jun 2016 16:19:49 +0200
Subject: [PATCH 198/303] c9-auto-bump 3.1.2697

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 687a4065..92638e07 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2696",
+    "version": "3.1.2697",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From b7b7039e1ccbd1592d15c496151c9847001db592 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 10 Jun 2016 16:31:37 +0200
Subject: [PATCH 199/303] c9-auto-bump 3.1.2698

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 92638e07..8cc8ae4e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2697",
+    "version": "3.1.2698",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From fc859861d6736df3ca698d96fa9a717426585f0d Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 10 Jun 2016 23:43:25 +0200
Subject: [PATCH 200/303] c9-auto-bump 3.1.2699

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8cc8ae4e..d649c7f6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2698",
+    "version": "3.1.2699",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 8404d87b950b81a0c96fda699a70f613647b40e5 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Sat, 11 Jun 2016 13:31:54 +0000
Subject: [PATCH 201/303] Add MIT license

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d649c7f6..1678e8d5 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#f62951109c",
+        "c9.ide.language": "#d1715f958f",
         "c9.ide.language.core": "#10a225e77d",
         "c9.ide.language.css": "#46ad561506",
         "c9.ide.language.generic": "#b47cbe58f9",

From adf47de431f3bfba4934fb1fd3afa0672b1ca9da Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Sat, 11 Jun 2016 19:46:37 +0000
Subject: [PATCH 202/303] Add dual MIT + SDK license

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 1678e8d5..f3984d50 100644
--- a/package.json
+++ b/package.json
@@ -58,11 +58,11 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#d1715f958f",
+        "c9.ide.language": "#0e86345d39",
         "c9.ide.language.core": "#10a225e77d",
         "c9.ide.language.css": "#46ad561506",
         "c9.ide.language.generic": "#b47cbe58f9",
-        "c9.ide.language.html": "#8e990755bb",
+        "c9.ide.language.html": "#cdc3960225",
         "c9.ide.language.html.diff": "#7d6cecfb90",
         "c9.ide.language.javascript": "#b82f16e56a",
         "c9.ide.language.javascript.immediate": "#82c426dbca",

From 58f80573fb33c223032a20d7c82f20268eb2a5a4 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Sat, 11 Jun 2016 21:51:53 +0200
Subject: [PATCH 203/303] c9-auto-bump 3.1.2700

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f3984d50..c9458361 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2699",
+    "version": "3.1.2700",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 598656c9ec874602b25036be987624093f0533bd Mon Sep 17 00:00:00 2001
From: Lennart kats <lennart@c9.io>
Date: Sun, 12 Jun 2016 11:58:40 +0000
Subject: [PATCH 204/303] Make sure temporary files are deleted

---
 package.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ec4ed0fb..2fa66a10 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     ],
     "c9plugins": {
         "c9.ide.language": "#79bcb2fe06",
+        "c9.ide.language.core": "#undefined",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#3949510863",
         "c9.ide.language.html": "#22fdc74869",
@@ -68,7 +69,7 @@
         "c9.ide.language.javascript.eslint": "#4de5457db1",
         "c9.ide.language.javascript.tern": "#64ab01f271",
         "c9.ide.language.javascript.infer": "#18acb93a3a",
-        "c9.ide.language.jsonalyzer": "#d8183d84b4",
+        "c9.ide.language.jsonalyzer": "#ce1a24bb2a",
         "c9.ide.language.codeintel": "#fc867feec4",
         "c9.ide.collab": "#1c0f841985",
         "c9.ide.local": "#10eb45842a",
@@ -94,7 +95,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#0e0c18066c",
         "c9.ide.installer": "#b2e4ba0a92",
-        "c9.ide.language.python": "#aff0772c78",
+        "c9.ide.language.python": "#e945ef6a50",
         "c9.ide.language.go": "#6ce1c7a7ef",
         "c9.ide.mount": "#6ddfd05db3",
         "c9.ide.navigate": "#5d5707058c",

From b775ed13ef64f25062c1b457bbf0824e0596d602 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 13 Jun 2016 01:39:13 +0400
Subject: [PATCH 205/303] workaround for broken outline for .module files

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c9458361..13987f7c 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
         "c9.ide.language.javascript.eslint": "#cb9e3f5a8e",
         "c9.ide.language.javascript.tern": "#0545a6385d",
         "c9.ide.language.javascript.infer": "#b9c2e4bdb8",
-        "c9.ide.language.jsonalyzer": "#a32369793c",
+        "c9.ide.language.jsonalyzer": "#e12da7d83e",
         "c9.ide.language.codeintel": "#4e0a272229",
         "c9.ide.collab": "#e015881720",
         "c9.ide.local": "#9169fec157",

From 77425311b7fb5687e05c83bd4415d0e993f43025 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 13 Jun 2016 03:08:37 +0200
Subject: [PATCH 206/303] c9-auto-bump 3.1.2701

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c9458361..db9a6b78 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2700",
+    "version": "3.1.2701",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 05d7c8a67305f2c69b0ae552c79445637eca020d Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 13 Jun 2016 05:15:08 +0200
Subject: [PATCH 207/303] c9-auto-bump 3.1.2702

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index db9a6b78..9542a97e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2701",
+    "version": "3.1.2702",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From c4c3556e864d452266199006722112ab8128cf8a Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 13 Jun 2016 10:08:29 +0200
Subject: [PATCH 208/303] c9-auto-bump 3.1.2703

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9542a97e..1a798756 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2702",
+    "version": "3.1.2703",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 7ab195a1648332c5a81b4d7f7704bb2b268e0bc0 Mon Sep 17 00:00:00 2001
From: Chris Brown <cbrown@fico.com>
Date: Mon, 13 Jun 2016 10:03:06 +0100
Subject: [PATCH 209/303] Fixed directory detection on IE11

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 98a86fc9..9df00215 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,7 @@
         "c9.ide.theme.flat": "#81dadeee55",
         "c9.ide.threewaymerge": "#229382aa0b",
         "c9.ide.undo": "#b028bcb4d5",
-        "c9.ide.upload": "#428de5c35b",
+        "c9.ide.upload": "#1ebe8411cf",
         "c9.ide.welcome": "#5b86c44e92",
         "c9.ide.guide": "#df7c89e449"
     }

From e3864651dc6b51bd364eb578d509feb1a29794e5 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 13 Jun 2016 13:07:19 +0200
Subject: [PATCH 210/303] c9-auto-bump 3.1.2704

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1a798756..7f66f343 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2703",
+    "version": "3.1.2704",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From f3d6dfa32014715eb81b207b299c6a1ad833a81c Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 13 Jun 2016 14:23:20 +0200
Subject: [PATCH 211/303] c9-auto-bump 3.1.2705

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7f66f343..976520be 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2704",
+    "version": "3.1.2705",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From a65f286a26f13efbc1c3076f2534545b2ac0d7e1 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 13 Jun 2016 16:08:33 +0200
Subject: [PATCH 212/303] c9-auto-bump 3.1.2706

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 976520be..0c51b80d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2705",
+    "version": "3.1.2706",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From e168c9600ad1372b5665beb59cbd6ec8211fbdc4 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 13 Jun 2016 17:20:31 +0200
Subject: [PATCH 213/303] c9-auto-bump 3.1.2707

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0c51b80d..af4c2e7b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2706",
+    "version": "3.1.2707",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 9a49ac23023ff0d2b3a898d4dc45d5003202575b Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 13 Jun 2016 17:22:12 +0200
Subject: [PATCH 214/303] c9-auto-bump 3.1.2708

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index af4c2e7b..72d46593 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2707",
+    "version": "3.1.2708",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From b27c0041609976ab3572f210404a4a8728349159 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 13 Jun 2016 20:43:05 +0200
Subject: [PATCH 215/303] c9-auto-bump 3.1.2709

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 72d46593..1c049cec 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2708",
+    "version": "3.1.2709",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 6a27aadc447eae803bc71150c0eb2575756060fc Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 13 Jun 2016 23:43:15 +0200
Subject: [PATCH 216/303] c9-auto-bump 3.1.2710

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1acd008b..3772dcca 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2709",
+    "version": "3.1.2710",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From ff662cc3f1fff1d2ce2e65d5969ffc492e349694 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 13 Jun 2016 23:43:45 +0200
Subject: [PATCH 217/303] c9-auto-bump 3.1.2711

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d0148dff..b6da9a79 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2710",
+    "version": "3.1.2711",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From b4383ac3a7b711f2dcdd42211221488c64a3ac0f Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Tue, 14 Jun 2016 02:21:22 +0400
Subject: [PATCH 218/303] add a way to use global msys installation on windows

---
 settings/standalone.js | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/settings/standalone.js b/settings/standalone.js
index 178905aa..b445b4ba 100644
--- a/settings/standalone.js
+++ b/settings/standalone.js
@@ -15,12 +15,8 @@ module.exports = function(manifest, installPath) {
     var sdk = !manifest.sdk;
     var win32 = process.platform == "win32";
     
-    if (win32) {
-        if (process.env.HOME === undefined)
-            process.env.HOME = process.env.HOMEDRIVE + process.env.HOMEPATH;
-        if (!/msys\/bin|Git\/bin/.test(process.env.PATH))
-            process.env.PATH = path.join(process.env.HOME, ".c9", "msys/bin") + ";" + process.env.PATH;
-    }
+    if (win32)
+        readWin32Settings();
     
     var home = process.env.HOME;
     
@@ -142,3 +138,21 @@ module.exports = function(manifest, installPath) {
 
     return config;
 };
+
+
+function readWin32Settings() {
+    var path = require("path");
+    var fs = require("fs");
+    if (process.env.HOME === undefined)
+        process.env.HOME = process.env.HOMEDRIVE + process.env.HOMEPATH;
+    if (!/msys\/bin|Git\/bin/.test(process.env.PATH))
+        process.env.PATH = path.join(process.env.HOME, ".c9", "msys/bin") + path.delimiter + process.env.PATH;
+    var settingsPath = path.join(process.env.HOME, ".c9", "standalone.settings");
+    try {
+        var s = fs.readFileSync(settingsPath, "utf8");
+        process.env.PATH = JSON.parse(s).bashDir + path.delimiter + process.env.PATH;
+    } catch(e) {
+        if (!fs.existsSync(path.join(process.env.HOME, ".c9", "msys/bin/bash.exe")))
+            console.error(e);
+    }
+}

From e9db8cae023ae67a77ab56fa9abf2f18c6235105 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 14 Jun 2016 00:35:29 +0200
Subject: [PATCH 219/303] c9-auto-bump 3.1.2712

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b6da9a79..b54591ca 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2711",
+    "version": "3.1.2712",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 48155c103509861deb7bc26de60e7e33b13755ef Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 14 Jun 2016 09:59:27 +0200
Subject: [PATCH 220/303] c9-auto-bump 3.1.2713

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b54591ca..cd4640a0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2712",
+    "version": "3.1.2713",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 426395c34357feeed8b3885dfed8491d72cc897c Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 14 Jun 2016 11:06:40 +0200
Subject: [PATCH 221/303] c9-auto-bump 3.1.2714

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cd4640a0..c0e6c979 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2713",
+    "version": "3.1.2714",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From f433a958d5d5f469af3dba058e2eec39477b4d59 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 14 Jun 2016 12:46:13 +0200
Subject: [PATCH 222/303] c9-auto-bump 3.1.2715

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c0e6c979..4589ef75 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2714",
+    "version": "3.1.2715",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 1daf4ce3243aa3d72390a1d40feb746dd88f8b58 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 14 Jun 2016 14:51:59 +0200
Subject: [PATCH 223/303] c9-auto-bump 3.1.2716

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4589ef75..28228482 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2715",
+    "version": "3.1.2716",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From ab718e7ec4c2f04e99c74280cffa377b42529d5b Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 14 Jun 2016 15:04:47 +0200
Subject: [PATCH 224/303] c9-auto-bump 3.1.2717

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 28228482..7d984b76 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2716",
+    "version": "3.1.2717",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 93af9454ce54d198a9a9673cef136ef16b8a6ff1 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 14 Jun 2016 16:46:36 +0200
Subject: [PATCH 225/303] c9-auto-bump 3.1.2718

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7d984b76..880b0bb8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2717",
+    "version": "3.1.2718",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 20521375f76719119d61768dc4df96978d4e2a1e Mon Sep 17 00:00:00 2001
From: Dana <dana@c9.io>
Date: Tue, 14 Jun 2016 15:12:16 +0000
Subject: [PATCH 226/303] Call identify on support menu loading in the ide

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7d984b76..4103611e 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
         "c9.ide.dialog.wizard": "#7667ec79a8",
         "c9.ide.fontawesome": "#781602c5d8",
         "c9.ide.format": "#f99082ff4c",
-        "c9.ide.help.support": "#932fbb3743",
+        "c9.ide.help.support": "#fbe8eb5c36",
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#76c8e3213a",
         "c9.ide.installer": "#b2e4ba0a92",

From b197f40916ae171176756e970aeb3d9fae2c3ee3 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 14 Jun 2016 17:22:15 +0200
Subject: [PATCH 227/303] c9-auto-bump 3.1.2719

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 880b0bb8..ffef065a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2718",
+    "version": "3.1.2719",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 0ca1d86f2441495678f925656d896e7b7bc6a908 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 14 Jun 2016 17:24:41 +0200
Subject: [PATCH 228/303] c9-auto-bump 3.1.2720

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ffef065a..c54b5472 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2719",
+    "version": "3.1.2720",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From b850b12208e55fcbe225d74e1e62539d259ec6e3 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 14 Jun 2016 19:18:47 +0200
Subject: [PATCH 229/303] c9-auto-bump 3.1.2721

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c54b5472..8631c48d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2720",
+    "version": "3.1.2721",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 885803a57c5de145b38fff0905df198e68ac7f47 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 15 Jun 2016 10:37:53 +0200
Subject: [PATCH 230/303] c9-auto-bump 3.1.2722

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0dea3c3a..781f04be 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2721",
+    "version": "3.1.2722",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From dea8605125923dc5affffb3ca1491e2519433844 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 15 Jun 2016 10:52:07 +0200
Subject: [PATCH 231/303] c9-auto-bump 3.1.2723

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 781f04be..a3f017b1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2722",
+    "version": "3.1.2723",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From b76b795bbb411ac8cc76674888be0460db6b23a4 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 15 Jun 2016 11:49:07 +0200
Subject: [PATCH 232/303] c9-auto-bump 3.1.2724

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a3f017b1..dca36054 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2723",
+    "version": "3.1.2724",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 9c7d3bfde0d61d22120497e7e1a11c7cd9550226 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 15 Jun 2016 12:14:19 +0200
Subject: [PATCH 233/303] c9-auto-bump 3.1.2725

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dca36054..a60a2488 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2724",
+    "version": "3.1.2725",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 7716845897f08a71448403f4443e69ab24a81030 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 15 Jun 2016 12:24:46 +0200
Subject: [PATCH 234/303] c9-auto-bump 3.1.2726

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a60a2488..7c750e60 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2725",
+    "version": "3.1.2726",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From d33475b712a456a2fff83c6a5bff2a74f29afcc6 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 15 Jun 2016 12:29:36 +0200
Subject: [PATCH 235/303] c9-auto-bump 3.1.2727

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7c750e60..79f88e3c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2726",
+    "version": "3.1.2727",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From a3950690539b36e6de4a6493ac26ab577ef384fb Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 15 Jun 2016 13:43:48 +0200
Subject: [PATCH 236/303] c9-auto-bump 3.1.2728

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 79f88e3c..2159f3d4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2727",
+    "version": "3.1.2728",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 8d6478ef663aa85f32f65941452267d40c4b52b3 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 15 Jun 2016 14:07:52 +0200
Subject: [PATCH 237/303] c9-auto-bump 3.1.2729

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2159f3d4..cb00c4de 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2728",
+    "version": "3.1.2729",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 8580c2e6ea66330ff191d2ba964a58760139d1b4 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 15 Jun 2016 14:30:12 +0200
Subject: [PATCH 238/303] c9-auto-bump 3.1.2730

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cb00c4de..b43ac3c1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2729",
+    "version": "3.1.2730",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 171276d1e07dcb8afefaddc4d8db9a8402c5ae7d Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 15 Jun 2016 15:30:34 +0200
Subject: [PATCH 239/303] c9-auto-bump 3.1.2731

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b43ac3c1..ad38bb30 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2730",
+    "version": "3.1.2731",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From a4431c73efe7fa4f8be064d6d56ff16ea7f51e5b Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 15 Jun 2016 15:54:31 +0200
Subject: [PATCH 240/303] c9-auto-bump 3.1.2732

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ad38bb30..6d62b567 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2731",
+    "version": "3.1.2732",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 93f35da2b7498c0de28f57241fbe317ddee6152a Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 15 Jun 2016 17:49:39 +0200
Subject: [PATCH 241/303] c9-auto-bump 3.1.2733

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6d62b567..5414c7ec 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2732",
+    "version": "3.1.2733",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From f93004d9ccc282589fbd1ed8558b3f853c5955a7 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 15 Jun 2016 18:41:41 +0200
Subject: [PATCH 242/303] c9-auto-bump 3.1.2734

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5414c7ec..35229ca0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2733",
+    "version": "3.1.2734",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From e05cba4b0a7d3faf6db9a52a187976149b28ef38 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 15 Jun 2016 18:51:13 +0200
Subject: [PATCH 243/303] c9-auto-bump 3.1.2735

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 35229ca0..364a85e1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2734",
+    "version": "3.1.2735",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 06e8310f7eea934b2593231cb073272f6cbfbd96 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 15 Jun 2016 19:49:30 +0200
Subject: [PATCH 244/303] c9-auto-bump 3.1.2736

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 364a85e1..a92a35d9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2735",
+    "version": "3.1.2736",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From adcf93eda4d16c4bc4dfa5863cc0bd3019b0c4a2 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 15 Jun 2016 22:49:20 +0200
Subject: [PATCH 245/303] c9-auto-bump 3.1.2737

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a92a35d9..4588f21d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2736",
+    "version": "3.1.2737",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From e116ea95443afbbb9e28a51f99f0fcb6cecf43f4 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 16 Jun 2016 00:29:58 +0200
Subject: [PATCH 246/303] c9-auto-bump 3.1.2738

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4588f21d..3723558b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2737",
+    "version": "3.1.2738",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From c308ddfd678f117cfe4af54beccde3f13f8f85d8 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 16 Jun 2016 00:32:55 +0200
Subject: [PATCH 247/303] c9-auto-bump 3.1.2739

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3723558b..f68190ed 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2738",
+    "version": "3.1.2739",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 6f0bade4a84c287e19311a6c49a3d6a2f549e0eb Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 16 Jun 2016 01:56:47 +0200
Subject: [PATCH 248/303] c9-auto-bump 3.1.2740

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f68190ed..362b2d04 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2739",
+    "version": "3.1.2740",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From e0825ca492fda606d92ad95c9681f59c3edfcc2e Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 16 Jun 2016 12:48:15 +0200
Subject: [PATCH 249/303] c9-auto-bump 3.1.2741

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 362b2d04..82f9dbed 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2740",
+    "version": "3.1.2741",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 04c5e9b7ed114faaf7f1f0c2dcd12da1a4002246 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 16 Jun 2016 15:06:29 +0200
Subject: [PATCH 250/303] c9-auto-bump 3.1.2742

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 82f9dbed..f191fbbb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2741",
+    "version": "3.1.2742",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 0a0bea56488aa2e056c6610cfa20e95485f6bbcb Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 16 Jun 2016 16:38:27 +0200
Subject: [PATCH 251/303] c9-auto-bump 3.1.2743

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f191fbbb..030e839b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2742",
+    "version": "3.1.2743",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 55b84657dbd2e714686ffdb83e70ee609c983614 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 16 Jun 2016 21:02:39 +0200
Subject: [PATCH 252/303] c9-auto-bump 3.1.2744

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 030e839b..439def9d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2743",
+    "version": "3.1.2744",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 54de2c1ce588462f8a62ccf5c754665097b9d3fa Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 17 Jun 2016 11:02:02 +0200
Subject: [PATCH 253/303] c9-auto-bump 3.1.2745

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 439def9d..e0afe247 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2744",
+    "version": "3.1.2745",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From cf9329d728ba2f010a8c0c27e489fc649e91659c Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 17 Jun 2016 11:03:39 +0200
Subject: [PATCH 254/303] c9-auto-bump 3.1.2746

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e0afe247..6ffb7dea 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2745",
+    "version": "3.1.2746",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 63e341ce00773476f7d78375dcc715f8a0b2eca0 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 17 Jun 2016 09:17:05 +0000
Subject: [PATCH 255/303] do not leave download hanging when file is empty

---
 plugins/c9.vfs.server/download.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugins/c9.vfs.server/download.js b/plugins/c9.vfs.server/download.js
index b259713e..066982fa 100644
--- a/plugins/c9.vfs.server/download.js
+++ b/plugins/c9.vfs.server/download.js
@@ -73,6 +73,17 @@ define(function(require, exports, module) {
                         meta.stream.pipe(res);
                     });
                     
+                    meta.stream.once("close", function() {
+                        if (res.headerSent)
+                            return;
+                            
+                        res.writeHead(200, {
+                            "Content-Type": "octet/stream",
+                            "Content-Disposition": filenameHeader
+                        });
+                        res.end();
+                    });
+                    
                     meta.stream.on("error", function(err){
                         res.writeHead(500);
                         res.end(err.message);

From 745511f8b591bccd1400c9fb4b71667354853adf Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Tue, 14 Jun 2016 01:06:46 +0400
Subject: [PATCH 256/303] update watchers when renaming files

---
 plugins/c9.fs/fs.cache.xml.js     |  6 +++---
 plugins/c9.ide.watcher/watcher.js | 20 ++++++++++++++++++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/plugins/c9.fs/fs.cache.xml.js b/plugins/c9.fs/fs.cache.xml.js
index bc68d3ef..a3d07777 100644
--- a/plugins/c9.fs/fs.cache.xml.js
+++ b/plugins/c9.fs/fs.cache.xml.js
@@ -254,7 +254,7 @@ define(function(require, exports, module) {
                     };
                     e.confirm = function () {
                         if (node.status === "predicted")
-                            node.status = "loaded";
+                            node.status = "pending";
                     };
                     node.status = "predicted";
                 }
@@ -348,7 +348,7 @@ define(function(require, exports, module) {
                     }
                     
                     if (node.status === "predicted")
-                        node.status = "loaded";
+                        node.status = "pending";
                 };
                 node.status = "predicted";
             }, plugin);
@@ -382,7 +382,7 @@ define(function(require, exports, module) {
                 };
                 e.confirm = function() {
                     if (node.status === "predicted")
-                        node.status = "loaded";
+                        node.status = "pending";
                 };
                 node.status = "predicted";
             }, plugin);
diff --git a/plugins/c9.ide.watcher/watcher.js b/plugins/c9.ide.watcher/watcher.js
index 471cc838..c4c24b92 100644
--- a/plugins/c9.ide.watcher/watcher.js
+++ b/plugins/c9.ide.watcher/watcher.js
@@ -48,8 +48,23 @@ define(function(require, exports, module) {
             
             fs.on("beforeWriteFile", ignoreHandler, plugin);
             fs.on("afterWriteFile", doneHandler, plugin);
-            fs.on("beforeRename", ignoreHandler, plugin);
-            fs.on("afterRename", doneHandler, plugin);
+            fs.on("beforeRename", function(e) {
+                e.watchers = [];
+                Object.keys(handlers).forEach(function(path) {
+                    if (path == e.path || path.startsWith(e.path + "/")) {
+                        if (unwatch(path))
+                            e.watchers.push(path.slice(e.path.length));
+                    }
+                });
+                ignoreHandler(e);
+            }, plugin);
+            fs.on("afterRename",  function(e) {
+                doneHandler(e);
+                var toPath = e.result[0] ? e.path : e.args[1];
+                e.watchers.forEach(function(path) {
+                    watch(toPath + path);
+                });
+            }, plugin);
             fs.on("beforeMkdir", ignoreHandler, plugin);
             fs.on("afterMkdir", doneHandler, plugin);
             fs.on("beforeMkdirP", ignoreHandler, plugin);
@@ -224,6 +239,7 @@ define(function(require, exports, module) {
                     fs.unwatch(path, handlers[path]);
                     emit("unwatch", { path: path });
                     delete handlers[path];
+                    return true;
                 } else {
                     handlers[path].unwatchScheduled = true;
                 }

From 14f6a65ea58591b351127ee85a32a1707be85ca1 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Wed, 15 Jun 2016 00:28:48 +0400
Subject: [PATCH 257/303] move watcher code to the server

---
 node_modules/vfs-local/localfs.js | 33 +++++++++++++++++++++++++++++--
 plugins/c9.ide.watcher/watcher.js | 20 ++-----------------
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/node_modules/vfs-local/localfs.js b/node_modules/vfs-local/localfs.js
index c53c1ad4..b440fedd 100644
--- a/node_modules/vfs-local/localfs.js
+++ b/node_modules/vfs-local/localfs.js
@@ -1039,7 +1039,7 @@ module.exports = function setup(fsOptions) {
                     
                     if (!exists || options.overwrite || isSamePath) {
                         // Rename the file
-                        fs.rename(frompath, topath, function (err) {
+                        renameWatchedFile(frompath, topath, function (err) {
                             if (err) {
                                 if (err.code == 'ENOENT' && options.mkdirP != false) {
                                     options.mkdirP = false;
@@ -1364,7 +1364,9 @@ module.exports = function setup(fsOptions) {
             close();
         };
         
-        this.resume = function(callback) {
+        this.resume = function(callback, newPath) {
+            if (newPath)
+                path = newPath;
             if (!listeners.length)
                 return callback();
             watch(callback);
@@ -1433,6 +1435,33 @@ module.exports = function setup(fsOptions) {
             });
         }
     }
+    
+    function renameWatchedFile(frompath, topath, callback) {
+        var removed = [];
+        Object.keys(fileWatchers).forEach(function(path) {
+            if (path.slice(0, frompath.length) == frompath && (path[frompath.length] == "/" || !path[frompath.length])) {
+                var watchers = fileWatchers[path].slice();
+                watchers.forEach(function(w) {
+                    w.pause();
+                });
+                removed.push({
+                    relpath: path.slice(frompath.length),
+                    watchers: watchers
+                });
+            }
+        });
+        fs.rename(frompath, topath, function(err) {
+            var root = err ? frompath : topath;
+            removed.forEach(function(x) {
+                var path = root + x.relpath;
+                x.watchers.forEach(function(w) {
+                    w.resume(function() {
+                    }, path);
+                });
+            });
+            callback(err);
+        });
+    }
 
     function connect(port, options, callback) {
         var retries = options.hasOwnProperty('retries') ? options.retries : 5;
diff --git a/plugins/c9.ide.watcher/watcher.js b/plugins/c9.ide.watcher/watcher.js
index c4c24b92..471cc838 100644
--- a/plugins/c9.ide.watcher/watcher.js
+++ b/plugins/c9.ide.watcher/watcher.js
@@ -48,23 +48,8 @@ define(function(require, exports, module) {
             
             fs.on("beforeWriteFile", ignoreHandler, plugin);
             fs.on("afterWriteFile", doneHandler, plugin);
-            fs.on("beforeRename", function(e) {
-                e.watchers = [];
-                Object.keys(handlers).forEach(function(path) {
-                    if (path == e.path || path.startsWith(e.path + "/")) {
-                        if (unwatch(path))
-                            e.watchers.push(path.slice(e.path.length));
-                    }
-                });
-                ignoreHandler(e);
-            }, plugin);
-            fs.on("afterRename",  function(e) {
-                doneHandler(e);
-                var toPath = e.result[0] ? e.path : e.args[1];
-                e.watchers.forEach(function(path) {
-                    watch(toPath + path);
-                });
-            }, plugin);
+            fs.on("beforeRename", ignoreHandler, plugin);
+            fs.on("afterRename", doneHandler, plugin);
             fs.on("beforeMkdir", ignoreHandler, plugin);
             fs.on("afterMkdir", doneHandler, plugin);
             fs.on("beforeMkdirP", ignoreHandler, plugin);
@@ -239,7 +224,6 @@ define(function(require, exports, module) {
                     fs.unwatch(path, handlers[path]);
                     emit("unwatch", { path: path });
                     delete handlers[path];
-                    return true;
                 } else {
                     handlers[path].unwatchScheduled = true;
                 }

From 32db4ea7e5018d99e71a08fdc8897e09c78547dd Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Wed, 15 Jun 2016 01:07:11 +0400
Subject: [PATCH 258/303] make refresh more robust to errors

---
 plugins/c9.fs/fs.cache.xml.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/c9.fs/fs.cache.xml.js b/plugins/c9.fs/fs.cache.xml.js
index a3d07777..73523999 100644
--- a/plugins/c9.fs/fs.cache.xml.js
+++ b/plugins/c9.fs/fs.cache.xml.js
@@ -35,6 +35,10 @@ define(function(require, exports, module) {
                 cb && cb(err, files);
             });
         };
+        model.shouldLoadChildren = function(node, ch) {
+            return node.status == "pending"
+                || (node.path && node.isFolder && !ch);
+        };
         model.getClassName = function(node) {
             var cl = node.className || "";
             if (node.link)

From 6d92bc304fd51a44c4c20f7954367b27331af493 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Wed, 15 Jun 2016 01:08:31 +0400
Subject: [PATCH 259/303] cleanup tree drag if mouseup was missed due to
 debugger

---
 node_modules/ace_tree/lib/ace_tree/mouse/drag_handler.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/node_modules/ace_tree/lib/ace_tree/mouse/drag_handler.js b/node_modules/ace_tree/lib/ace_tree/mouse/drag_handler.js
index 22d1565d..d9254640 100644
--- a/node_modules/ace_tree/lib/ace_tree/mouse/drag_handler.js
+++ b/node_modules/ace_tree/lib/ace_tree/mouse/drag_handler.js
@@ -161,6 +161,7 @@ function initDragHandlers(mouseHandler) {
     
     mouseHandler.dragEnd = function(e, cancel) {
         if (dragInfo) {
+            window.removeEventListener("mousedown", keyHandler, true);
             window.removeEventListener("keydown", keyHandler, true);
             window.removeEventListener("keyup", keyHandler, true);
             if (dragInfo.el && dragInfo.el.parentNode)
@@ -190,6 +191,8 @@ function initDragHandlers(mouseHandler) {
     };
     
     mouseHandler.dragStart = function() {
+        if (dragInfo)
+            this.dragEnd(null, true);
         mouseHandler.setState("drag");
         tree.renderer.visualizeBlur();
         tree.renderer.setStyle("dragOver", true);
@@ -205,6 +208,7 @@ function initDragHandlers(mouseHandler) {
             return;
         mouseHandler.dragStart();
         
+        window.addEventListener("mousedown", keyHandler, true);
         window.addEventListener("keydown", keyHandler, true);
         window.addEventListener("keyup", keyHandler, true);
         
@@ -267,7 +271,7 @@ function initDragHandlers(mouseHandler) {
     
     function keyHandler(e){
         if (dragInfo) {
-            if (e.keyCode === 27) {
+            if (e.keyCode === 27 || e.type == "mousedown") {
                 mouseHandler.dragEnd(null, true);
                 event.stopEvent(e);
             } else if (dragInfo && e.keyCode == 17 ||  e.keyCode == 18) {

From d07f5e1febfb7d928e66f821964288be318df9ed Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Wed, 15 Jun 2016 02:09:54 +0400
Subject: [PATCH 260/303] do not recreate deleted node when rm returns ENOENT

---
 plugins/c9.fs/fs.cache.xml.js    | 10 ++++++++--
 plugins/c9.ide.tree/tree_test.js | 15 +++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/plugins/c9.fs/fs.cache.xml.js b/plugins/c9.fs/fs.cache.xml.js
index 73523999..6c780202 100644
--- a/plugins/c9.fs/fs.cache.xml.js
+++ b/plugins/c9.fs/fs.cache.xml.js
@@ -266,7 +266,7 @@ define(function(require, exports, module) {
             
             function removeSingleNode(e) {
                 var node = findNode(e.path);
-                if (!node) return; //Node doesn't exist
+                if (!node) return; // Node doesn't exist
                 
                 deleteNode(node);
                 emit("remove", {
@@ -274,8 +274,9 @@ define(function(require, exports, module) {
                     node: node
                 });
                 
-                // todo
                 e.undo = function(){
+                    if (this.error && this.error.code == "ENOENT") 
+                        return;
                     createNode(node.path, null, node);
                     emit("add", {
                         path: node.path,
@@ -668,6 +669,11 @@ define(function(require, exports, module) {
                 });
                 return;
             }
+            if (orphans[node.path] == node) {
+                delete orphans[node.path];
+                if (parent.map[node.label] != node)
+                    return;
+            }
             silent || model._signal("remove", node);
             var wasOpen = startUpdate(parent);
             delete parent.map[node.label];
diff --git a/plugins/c9.ide.tree/tree_test.js b/plugins/c9.ide.tree/tree_test.js
index 1aa41a44..9c49a2df 100644
--- a/plugins/c9.ide.tree/tree_test.js
+++ b/plugins/c9.ide.tree/tree_test.js
@@ -25,7 +25,8 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root"],
         "plugins/c9.core/util",
         {
             packagePath: "plugins/c9.core/settings",
-            settings: "default"
+            settings: "default",
+            testing: true
         },
         "plugins/c9.core/api.js", 
         {
@@ -53,16 +54,6 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root"],
         "plugins/c9.ide.dialog.common/fileremove",
         "plugins/c9.ide.dialog.common/question",
         
-        //Mock Plugins
-        {
-            consumes: ["apf", "ui", "Plugin"],
-            provides: [
-                "commands", "panels", "tabManager", "layout", "watcher", 
-                "preferences", "clipboard", "Panel", "auth.bootstrap", "info", 
-                "proc", "focusManager", "dialog.error", "error_handler"
-            ],
-            setup: expect.html.mocked
-        },
         {
             consumes: ["tree", "fs", "fs.cache", "tabManager", "ui", 
                 "dialog.question", "dialog.alert"],
@@ -85,7 +76,7 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root"],
         function getDomNode(treeNode) {
             var r = tree.tree.renderer;
             r.$renderChanges(r.$loop.changes);
-            var i = r.provider.getIndexForNode(treeNode)
+            var i = r.provider.getIndexForNode(treeNode);
             return r.$cellLayer.getDomNodeAtIndex(i);
         }
         

From 3131833a9ed39c4db37e206ac947dcd0630ecf5a Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 17 Jun 2016 12:52:56 +0200
Subject: [PATCH 261/303] c9-auto-bump 3.1.2747

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6ffb7dea..264d988e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2746",
+    "version": "3.1.2747",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From c12c275fb4dc0849da2e659ab0990251a117b892 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 17 Jun 2016 14:17:45 +0000
Subject: [PATCH 262/303] remove noise from architect

---
 node_modules/architect/architect.js   | 5 -----
 plugins/c9.vfs.standalone/www/test.js | 1 -
 2 files changed, 6 deletions(-)

diff --git a/node_modules/architect/architect.js b/node_modules/architect/architect.js
index 086f43a3..3304e1ba 100644
--- a/node_modules/architect/architect.js
+++ b/node_modules/architect/architect.js
@@ -397,13 +397,8 @@ function checkCycles(config, lookup) {
                 delete unresolved[name];
         });
 
-        var pluginsList = plugins.map(function(p) { return p.packagePath; }).join("\n");
         var unresolvedList = Object.keys(unresolved);
         var resolvedList = Object.keys(resolved);
-        console.warn("Could not resolve dependencies of these plugins:\n"
-            + pluginsList + "\n", plugins,
-            "\nMissing services:\n" + unresolvedList.join("\n") + "\n", unresolved,
-            "\nResolved services:", resolvedList);
         var err  = new Error("Could not resolve dependencies\n"
             + (unresolvedList.length ? "Missing services: " + unresolvedList
             : "Config contains cyclic dependencies" // TODO print cycles
diff --git a/plugins/c9.vfs.standalone/www/test.js b/plugins/c9.vfs.standalone/www/test.js
index 3063fc79..59328e1a 100644
--- a/plugins/c9.vfs.standalone/www/test.js
+++ b/plugins/c9.vfs.standalone/www/test.js
@@ -563,7 +563,6 @@ require([
                     if (err.missingMock.length) {
                         console.error("Missing mock services for " + err.missingMock);
                     } else {
-                        console.warn("Adding mock services for " + err.unresolved);
                         return expect.setupArchitectTest(config, architect, {
                             mockPlugins: config.unresolved,
                             existingPlugins: err.resolved

From 7ae3908e3aed5a2c42ea517ed43b4c637eecfd78 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Fri, 17 Jun 2016 17:49:26 +0200
Subject: [PATCH 263/303] c9-auto-bump 3.1.2748

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 264d988e..10970ed0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2747",
+    "version": "3.1.2748",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From f5083813a17360e16ad9f1d13904096796f0e1f7 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sun, 19 Jun 2016 13:25:34 +0400
Subject: [PATCH 264/303] fix several flaky tests

---
 package.json                   | 8 ++++----
 plugins/c9.ide.ace/ace_test.js | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 439def9d..f6a35317 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
         "c9.ide.language.generic": "#b47cbe58f9",
         "c9.ide.language.html": "#cdc3960225",
         "c9.ide.language.html.diff": "#7d6cecfb90",
-        "c9.ide.language.javascript": "#b82f16e56a",
+        "c9.ide.language.javascript": "#a5c1d05394",
         "c9.ide.language.javascript.immediate": "#82c426dbca",
         "c9.ide.language.javascript.eslint": "#cb9e3f5a8e",
         "c9.ide.language.javascript.tern": "#0545a6385d",
@@ -79,7 +79,7 @@
         "c9.ide.run.debug": "#a84da3e7f8",
         "c9.automate": "#47e2c429c9",
         "c9.ide.ace.emmet": "#6dc4585e02",
-        "c9.ide.ace.gotoline": "#dcbe58d549",
+        "c9.ide.ace.gotoline": "#d33220b1e0",
         "c9.ide.ace.keymaps": "#334a65192f",
         "c9.ide.ace.repl": "#4b88a85b7b",
         "c9.ide.ace.split": "#0ae0151c78",
@@ -93,11 +93,11 @@
         "c9.ide.format": "#f99082ff4c",
         "c9.ide.help.support": "#fbe8eb5c36",
         "c9.ide.imgeditor": "#612e75ef4f",
-        "c9.ide.immediate": "#76c8e3213a",
+        "c9.ide.immediate": "#b279c69c73",
         "c9.ide.installer": "#b2e4ba0a92",
         "c9.ide.language.python": "#15e7ff9a3f",
         "c9.ide.language.go": "#6ce1c7a7ef",
-        "c9.ide.mount": "#3001a633f2",
+        "c9.ide.mount": "#b018ee501f",
         "c9.ide.navigate": "#5d5707058c",
         "c9.ide.newresource": "#981a408a7b",
         "c9.ide.openfiles": "#2ae85a9e33",
diff --git a/plugins/c9.ide.ace/ace_test.js b/plugins/c9.ide.ace/ace_test.js
index 2abd9b0a..80577129 100644
--- a/plugins/c9.ide.ace/ace_test.js
+++ b/plugins/c9.ide.ace/ace_test.js
@@ -283,8 +283,11 @@ require(["lib/architect/architect", "lib/chai/chai"], function (architect, chai)
                     editor.setOption("wrapToView", true);
                     
                     render();
+                    var ace = editor.ace;
+                    var cols = Math.floor((ace.container.offsetWidth - ace.renderer.gutterWidth - 2 * ace.renderer.$padding) / charWidth);
                     
-                    expect(document.querySelector(".ace_gutter-cell").offsetHeight).to.equal(lineHeight * 4);
+                    expect(cols).to.equal(ace.session.getWrapLimit());
+                    expect(document.querySelector(".ace_gutter-cell").offsetHeight).to.equal(lineHeight * ace.session.getRowLength(0));
                     done();
                 });
                 it('should allow setting wrapBehavioursEnabled', function(done) {

From 9244db6b2c6f5bd3418a0c2c080d8bb7fb6a8d0f Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sun, 19 Jun 2016 14:01:12 +0400
Subject: [PATCH 265/303] return correct exit code

---
 plugins/c9.vfs.standalone/www/test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/c9.vfs.standalone/www/test.js b/plugins/c9.vfs.standalone/www/test.js
index 59328e1a..1fd0abcb 100644
--- a/plugins/c9.vfs.standalone/www/test.js
+++ b/plugins/c9.vfs.standalone/www/test.js
@@ -238,7 +238,7 @@ require([
                 
                 layout.initMenus = function() {};
                 layout.findParent = function(){
-                    if (!bar || bar.$amlDestroyed) {
+                    if (!bar || bar.$amlDestroyed || !bar.$ext || !bar.$ext.parentNode) {
                         bar = apf.document.documentElement.appendChild(
                             new imports.ui.bar());
                         bar.$ext.style.position = "fixed";

From 01b922677549ea432b91e15efccc943ccc9e30de Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sun, 19 Jun 2016 14:29:18 +0400
Subject: [PATCH 266/303] upload_manager_test can run only on chrome

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f6a35317..cbfcba90 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,7 @@
         "c9.ide.theme.flat": "#81dadeee55",
         "c9.ide.threewaymerge": "#229382aa0b",
         "c9.ide.undo": "#b028bcb4d5",
-        "c9.ide.upload": "#1ebe8411cf",
+        "c9.ide.upload": "#e4351f5a2b",
         "c9.ide.welcome": "#5b86c44e92",
         "c9.ide.guide": "#df7c89e449"
     }

From 1fabe6c3c900ac28aee1349bd806e2021408456b Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sun, 19 Jun 2016 14:36:15 +0400
Subject: [PATCH 267/303] take screenshot on failure

---
 plugins/c9.vfs.standalone/www/test.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/c9.vfs.standalone/www/test.html b/plugins/c9.vfs.standalone/www/test.html
index 10015f94..fe3c75f0 100644
--- a/plugins/c9.vfs.standalone/www/test.html
+++ b/plugins/c9.vfs.standalone/www/test.html
@@ -24,6 +24,7 @@
         mocha.setup('bdd');
         mocha.bail(false);
         mocha.ignoreLeaks(true);
+        mocha.fullTrace && mocha.fullTrace();
         window.onerror=function(msg){ var el=document.getElementById('jserror'); el.innerHTML+="<div class='jserr'>"+msg+"</div>";};
         
         /* wrap setTimeout to prevent any plugins leaking timeouts to the next test*/ 
@@ -120,6 +121,8 @@
             runner.on('test end', function(test) {
                 stats.percent = stats.tests / runner.total * 100 | 0;
                 tests.push(test);
+                if (mocha._onSubTest)
+                    mocha._onSubTest(test);
             });
 
             runner.on('end', function() {
@@ -127,7 +130,6 @@
                 // e.g. using on instead of once can call done second time during app unload
                 // so we save the report at the time when test runner ended.
                 mocha.lastReport = mocha.getReport();
-                console.log(mocha.report);
             });
             
             function parseError(err) {

From 00e9ced6eaa3d507d20347c78234c20d3b58dfdb Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sun, 19 Jun 2016 15:54:24 +0400
Subject: [PATCH 268/303] disable tests failing on phantomjs

---
 package.json                             | 2 +-
 plugins/c9.ide.terminal/terminal_test.js | 4 ++--
 plugins/c9.nodeapi/assert.js             | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index cbfcba90..34847d03 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
         "c9.ide.processlist": "#2b12cd1bdd",
         "c9.ide.run": "#d661a7b847",
         "c9.ide.run.build": "#0598fff697",
-        "c9.ide.run.debug.xdebug": "#9956689819",
+        "c9.ide.run.debug.xdebug": "#054367574c",
         "c9.ide.save": "#25a63f31e2",
         "c9.ide.scm": "#637a68cd04",
         "c9.ide.terminal.monitor": "#5a6a54ce24",
diff --git a/plugins/c9.ide.terminal/terminal_test.js b/plugins/c9.ide.terminal/terminal_test.js
index 3c967744..d3ce9856 100644
--- a/plugins/c9.ide.terminal/terminal_test.js
+++ b/plugins/c9.ide.terminal/terminal_test.js
@@ -112,7 +112,7 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root"], function (arc
                 // @todo Test mouse
                 // @todo Test menu
 
-                it('should reconnect when the connection has been lost', function(done) {
+                it.skip('should reconnect when the connection has been lost', function(done) {
                     var doc = tabs.focussedTab.document;
                     var session = doc.getSession();
                     
@@ -226,7 +226,7 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root"], function (arc
                     });
                 });
                 if (!onload.remain) {
-                    it('should reconnect both terminals when doing kill-server', function(done) {
+                    it.skip('should reconnect both terminals when doing kill-server', function(done) {
                         var count = 0;
                         tabs.getTabs().forEach(function(tab) {
                             var session = tab.document.getSession();
diff --git a/plugins/c9.nodeapi/assert.js b/plugins/c9.nodeapi/assert.js
index 8ec96273..1e768ba8 100644
--- a/plugins/c9.nodeapi/assert.js
+++ b/plugins/c9.nodeapi/assert.js
@@ -46,7 +46,12 @@ assert.AssertionError = function AssertionError(options) {
   this.operator = options.operator;
   this.message = options.message || getMessage(this);
   var stackStartFunction = options.stackStartFunction || fail;
-  Error.captureStackTrace(this, stackStartFunction);
+  if (Error.captureStackTrace) {
+    Error.captureStackTrace(this, stackStartFunction);
+  } else {
+    var err = new Error();
+    this.stack = err.stack;
+  }
 };
 
 // assert.AssertionError instanceof Error

From f80f838819acea0d36fa0bf191c16145f39252cc Mon Sep 17 00:00:00 2001
From: Rob Moran <github@thegecko.org>
Date: Sun, 19 Jun 2016 13:05:17 +0100
Subject: [PATCH 269/303] Added callback path to rename function

---
 node_modules/vfs-local/localfs.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/node_modules/vfs-local/localfs.js b/node_modules/vfs-local/localfs.js
index c53c1ad4..10b5059d 100644
--- a/node_modules/vfs-local/localfs.js
+++ b/node_modules/vfs-local/localfs.js
@@ -1051,16 +1051,18 @@ module.exports = function setup(fsOptions) {
                                 return callback(err);
                             }
                             
-                            // Rename metadata
-                            if (options.metadata !== false) {
-                                var metaPath = WSMETAPATH;
-                                rename(metaPath + from, {
-                                    to: metaPath + to,
-                                    metadata: false
-                                }, function(err){
-                                    callback(null, meta);
-                                });
+                            if (options.metadata === false) {
+                                return callback(null, meta);
                             }
+
+                            // Rename metadata
+                            var metaPath = WSMETAPATH;
+                            rename(metaPath + from, {
+                                to: metaPath + to,
+                                metadata: false
+                            }, function(err){
+                                callback(null, meta);
+                            });
                         });
                     }
                     else {

From 86ac0ec42bf50c94d80ce5620d545eec46aae611 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sun, 19 Jun 2016 16:06:56 +0400
Subject: [PATCH 270/303] better cleanup after destroying reconnect socket

---
 node_modules/kaefer/lib/client.js   | 9 +++++++++
 plugins/c9.vfs.client/vfs_client.js | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/node_modules/kaefer/lib/client.js b/node_modules/kaefer/lib/client.js
index 3f6bd7f0..289fbd81 100644
--- a/node_modules/kaefer/lib/client.js
+++ b/node_modules/kaefer/lib/client.js
@@ -50,6 +50,9 @@ var connectClient = module.exports = function(connectEio, options) {
             });
 
             eioSocket.on("message", function handshakeReply(msg) {
+                if (reconnectSocket.destroying) return;
+                if (reconnectSocket.socket && reconnectSocket.socket != eioSocket)
+                    return console.error("reconenct for detached socket");
                 try {
                     msg = JSON.parse(msg);
                 } catch (e) {}
@@ -75,11 +78,17 @@ var connectClient = module.exports = function(connectEio, options) {
             });
 
             eioSocket.on("error", function(e) {
+                if (reconnectSocket.destroying) return;
+                if (reconnectSocket.socket && reconnectSocket.socket != eioSocket)
+                    return console.error("reconenct for detached socket");
                 console.error("Socket error; reconnecting:", e);
                 eioSocket.close();
                 reconnect();
             });
             eioSocket.on("close", function(e) {
+                if (reconnectSocket.destroying) return;
+                if (reconnectSocket.socket && reconnectSocket.socket != eioSocket)
+                    return console.error("reconenct for detached socket");
                 console.error("Socket close; reconnecting:", e);
                 reconnect();
             });
diff --git a/plugins/c9.vfs.client/vfs_client.js b/plugins/c9.vfs.client/vfs_client.js
index 9badea1b..dd0c974c 100644
--- a/plugins/c9.vfs.client/vfs_client.js
+++ b/plugins/c9.vfs.client/vfs_client.js
@@ -345,7 +345,8 @@ define(function(require, exports, module) {
         });
         plugin.on("unload", function(){
             loaded = false;
-            
+            if (connection && connection.socket)
+                connection.socket.destroying = true;
             if (consumer)
                 consumer.disconnect();
             if (connection)

From 7ad49a0a0e9426f81b4d066ebde94b1dbcd0bb96 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sun, 19 Jun 2016 19:37:36 +0400
Subject: [PATCH 271/303] disable flaky language tests

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 34847d03..9496828b 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     ],
     "c9plugins": {
         "c9.ide.language": "#0e86345d39",
-        "c9.ide.language.core": "#10a225e77d",
+        "c9.ide.language.core": "#dcd180236b",
         "c9.ide.language.css": "#46ad561506",
         "c9.ide.language.generic": "#b47cbe58f9",
         "c9.ide.language.html": "#cdc3960225",

From a541d3e276388522928b7828fb6650f706569442 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Sun, 19 Jun 2016 20:54:14 +0200
Subject: [PATCH 272/303] c9-auto-bump 3.1.2749

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 10970ed0..21a9f170 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2748",
+    "version": "3.1.2749",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 7b9bd4ef2a6884ac0f61f1c8a05c4ab44d1a9eb0 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 17 Jun 2016 15:57:39 +0400
Subject: [PATCH 273/303] add back client side watcher handling for rename

---
 plugins/c9.ide.watcher/watcher.js | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/plugins/c9.ide.watcher/watcher.js b/plugins/c9.ide.watcher/watcher.js
index 471cc838..f8eaec80 100644
--- a/plugins/c9.ide.watcher/watcher.js
+++ b/plugins/c9.ide.watcher/watcher.js
@@ -46,10 +46,29 @@ define(function(require, exports, module) {
                 }
             }
             
+            function unwatchChildren(e) {
+                e.watchers = [];
+                Object.keys(handlers).forEach(function(path) {
+                    if (path == e.path || path.startsWith(e.path + "/")) {
+                        if (unwatch(path))
+                            e.watchers.push(path.slice(e.path.length));
+                    }
+                });
+                ignoreHandler(e);
+            }
+            
+            function rewatchChildren(e) {
+                doneHandler(e);
+                var toPath = e.result[0] ? e.path : e.args[1];
+                e.watchers.forEach(function(path) {
+                    watch(toPath + path);
+                });
+            }
+            
             fs.on("beforeWriteFile", ignoreHandler, plugin);
             fs.on("afterWriteFile", doneHandler, plugin);
-            fs.on("beforeRename", ignoreHandler, plugin);
-            fs.on("afterRename", doneHandler, plugin);
+            fs.on("beforeRename", unwatchChildren, plugin);
+            fs.on("afterRename", rewatchChildren, plugin);
             fs.on("beforeMkdir", ignoreHandler, plugin);
             fs.on("afterMkdir", doneHandler, plugin);
             fs.on("beforeMkdirP", ignoreHandler, plugin);

From 4b512199696789ecbfd78393fed05de4df379b47 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Sun, 19 Jun 2016 20:58:56 +0200
Subject: [PATCH 274/303] c9-auto-bump 3.1.2750

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 21a9f170..7063c601 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2749",
+    "version": "3.1.2750",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 5c2bed1c6205f28cb32b8c8937455869b221d0ad Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Sun, 19 Jun 2016 20:59:26 +0200
Subject: [PATCH 275/303] c9-auto-bump 3.1.2751

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7063c601..8d40dc41 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2750",
+    "version": "3.1.2751",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 9354fefd0cb5e2bf04d1f2db89fb8e5730c8dc6f Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 20 Jun 2016 00:56:28 +0400
Subject: [PATCH 276/303] do not checkout branch when resetting a file

---
 plugins/c9.ide.terminal/link_handler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/c9.ide.terminal/link_handler.js b/plugins/c9.ide.terminal/link_handler.js
index 4543a31f..23c25d39 100644
--- a/plugins/c9.ide.terminal/link_handler.js
+++ b/plugins/c9.ide.terminal/link_handler.js
@@ -107,7 +107,7 @@ define(function(require, exports, module) {
                     else if (e.value === "gitadd")
                         lastLink.editor.onPaste("git add " + lastLink.value + "\n");
                     else if (e.value === "gitcheckout")
-                        lastLink.editor.onPaste("git checkout " + lastLink.value);
+                        lastLink.editor.onPaste("git checkout -- " + lastLink.value);
                     else if (e.value === "gitdiff")
                         lastLink.editor.onPaste("git diff " + lastLink.value + "\n");
                     else if (e.value === "gitrm")

From 26d77800bffa16a09693363cf8fc97125455e6a7 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 16 Jun 2016 13:06:42 +0400
Subject: [PATCH 277/303] always open pdf in browser previewer instead of raw

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8d40dc41..8d30d990 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
         "c9.ide.newresource": "#981a408a7b",
         "c9.ide.openfiles": "#2ae85a9e33",
         "c9.ide.preview": "#5f5fff0185",
-        "c9.ide.preview.browser": "#897177be7f",
+        "c9.ide.preview.browser": "#829f0ac50f",
         "c9.ide.preview.markdown": "#c3174d86e0",
         "c9.ide.pubsub": "#99b7289040",
         "c9.ide.readonly": "#7421caab61",

From 2f32dff46f027c39324ae69e8fdc1483bddba464 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 20 Jun 2016 01:52:43 +0400
Subject: [PATCH 278/303] experimental: allow passing socketpath to debugger
 proxy

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8d30d990..d0429d5a 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
         "c9.ide.find": "#a2dfc3e306",
         "c9.ide.find.infiles": "#488db22ee1",
         "c9.ide.find.replace": "#47a84af707",
-        "c9.ide.run.debug": "#a84da3e7f8",
+        "c9.ide.run.debug": "#08249419c5",
         "c9.automate": "#47e2c429c9",
         "c9.ide.ace.emmet": "#6dc4585e02",
         "c9.ide.ace.gotoline": "#dcbe58d549",

From 76a211815f553ccacdbe6d3285618e9329a251fa Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 20 Jun 2016 10:02:48 +0200
Subject: [PATCH 279/303] c9-auto-bump 3.1.2752

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 49775176..c99847b5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2751",
+    "version": "3.1.2752",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 5816873eb51b468f0b939a66680a00981b0fe1ce Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 20 Jun 2016 10:09:08 +0200
Subject: [PATCH 280/303] c9-auto-bump 3.1.2753

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c99847b5..97c388ef 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2752",
+    "version": "3.1.2753",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From c7ffaf67e5caa663fb3698c797b58c6472e6b32c Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 20 Jun 2016 10:09:21 +0200
Subject: [PATCH 281/303] c9-auto-bump 3.1.2754

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 97c388ef..10a35786 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2753",
+    "version": "3.1.2754",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From b8ab185b5a3ce17e9d84a0dc35cb6d1823c0380e Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 20 Jun 2016 10:09:37 +0200
Subject: [PATCH 282/303] c9-auto-bump 3.1.2755

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 10a35786..098e88a8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2754",
+    "version": "3.1.2755",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 0999a6bcae6ef9cf1851ceba320af10197fbca0f Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 20 Jun 2016 14:35:40 +0200
Subject: [PATCH 283/303] c9-auto-bump 3.1.2756

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 098e88a8..fa23c2b3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2755",
+    "version": "3.1.2756",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 8d76146c6ecaabf7e51820254b9f534fe8d67b54 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 20 Jun 2016 15:03:51 +0200
Subject: [PATCH 284/303] c9-auto-bump 3.1.2757

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fa23c2b3..2cd8e84c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2756",
+    "version": "3.1.2757",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 5ba420129ccb51a33060ee64e05a98569d0ff614 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 20 Jun 2016 17:16:59 +0400
Subject: [PATCH 285/303] fix outline for php files with non-standard
 extensions

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d0429d5a..65367836 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     ],
     "c9plugins": {
         "c9.ide.language": "#0e86345d39",
-        "c9.ide.language.core": "#10a225e77d",
+        "c9.ide.language.core": "#5b00a7caa7",
         "c9.ide.language.css": "#46ad561506",
         "c9.ide.language.generic": "#b47cbe58f9",
         "c9.ide.language.html": "#cdc3960225",
@@ -69,7 +69,7 @@
         "c9.ide.language.javascript.eslint": "#cb9e3f5a8e",
         "c9.ide.language.javascript.tern": "#0545a6385d",
         "c9.ide.language.javascript.infer": "#b9c2e4bdb8",
-        "c9.ide.language.jsonalyzer": "#e12da7d83e",
+        "c9.ide.language.jsonalyzer": "#bc18c81bf6",
         "c9.ide.language.codeintel": "#4e0a272229",
         "c9.ide.collab": "#e015881720",
         "c9.ide.local": "#9169fec157",

From 6ff31114c833a416122f644a73f5585880faaef3 Mon Sep 17 00:00:00 2001
From: "Lennart C. L. Kats" <lclkats@gmail.com>
Date: Mon, 20 Jun 2016 16:50:20 +0200
Subject: [PATCH 286/303] Speed up cleanup

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2fa66a10..49a14b24 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
         "c9.ide.language.javascript.eslint": "#4de5457db1",
         "c9.ide.language.javascript.tern": "#64ab01f271",
         "c9.ide.language.javascript.infer": "#18acb93a3a",
-        "c9.ide.language.jsonalyzer": "#ce1a24bb2a",
+        "c9.ide.language.jsonalyzer": "#d86bebdd79",
         "c9.ide.language.codeintel": "#fc867feec4",
         "c9.ide.collab": "#1c0f841985",
         "c9.ide.local": "#10eb45842a",

From a7a48dd87674fc1b4e225832ddcdd184c51ddf77 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 20 Jun 2016 17:21:35 +0200
Subject: [PATCH 287/303] c9-auto-bump 3.1.2758

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a8f6d855..c96039e8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2757",
+    "version": "3.1.2758",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From d56336cdd965125ea5baf6c46bdd81c899e40cc7 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 21 Jun 2016 13:31:52 +0200
Subject: [PATCH 288/303] c9-auto-bump 3.1.2759

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c96039e8..c0713f7e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2758",
+    "version": "3.1.2759",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From f44095aef17330f1fe70e4b6d7cc4aac1d02466b Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 21 Jun 2016 15:58:52 +0200
Subject: [PATCH 289/303] c9-auto-bump 3.1.2760

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c0713f7e..22ef9aea 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2759",
+    "version": "3.1.2760",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From fd653fef8f5bfff774844b9d4a838add11245097 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 21 Jun 2016 16:36:55 +0200
Subject: [PATCH 290/303] c9-auto-bump 3.1.2761

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 22ef9aea..f9550a48 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2760",
+    "version": "3.1.2761",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 8888de7468842a818c9d10818868a77271eb1c1a Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 21 Jun 2016 16:38:26 +0200
Subject: [PATCH 291/303] c9-auto-bump 3.1.2762

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f9550a48..f35da236 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2761",
+    "version": "3.1.2762",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 68ceb3f5b83d884692125a785a3acc60fea128af Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 21 Jun 2016 16:44:45 +0200
Subject: [PATCH 292/303] c9-auto-bump 3.1.2763

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f35da236..3e10618e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2762",
+    "version": "3.1.2763",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 9498bad42a12c492c664f69d59590bdcf9381e3d Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 21 Jun 2016 16:49:44 +0200
Subject: [PATCH 293/303] c9-auto-bump 3.1.2764

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3e10618e..52fa2f0d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2763",
+    "version": "3.1.2764",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From f2da729a05fd367f10898683240b93517a925e39 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 22 Jun 2016 02:54:15 +0200
Subject: [PATCH 294/303] c9-auto-bump 3.1.2765

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 52fa2f0d..2a698404 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2764",
+    "version": "3.1.2765",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 1f98cc107a5f8a2583b24c121fadbb587b6dbb69 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 22 Jun 2016 09:10:05 +0200
Subject: [PATCH 295/303] c9-auto-bump 3.1.2766

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2a698404..fff94034 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2765",
+    "version": "3.1.2766",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 480741d29aa7e835c6ee0bed780e130068244787 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 22 Jun 2016 09:53:31 +0200
Subject: [PATCH 296/303] c9-auto-bump 3.1.2767

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fff94034..94f5b40b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2766",
+    "version": "3.1.2767",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 3ab6a243fb6bfa84fae9c64caf934a7e31cdbcc1 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 22 Jun 2016 10:39:58 +0200
Subject: [PATCH 297/303] c9-auto-bump 3.1.2768

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 94f5b40b..d8f348ca 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2767",
+    "version": "3.1.2768",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From e638e4923b32e4a3920798c7602fb06a1ff92c15 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 22 Jun 2016 10:44:41 +0200
Subject: [PATCH 298/303] c9-auto-bump 3.1.2769

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d8f348ca..e7e932a3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2768",
+    "version": "3.1.2769",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 8f468be914fb79a48ebd985f853a49ed37fb377b Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 22 Jun 2016 10:56:04 +0200
Subject: [PATCH 299/303] c9-auto-bump 3.1.2770

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e7e932a3..d29d720f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2769",
+    "version": "3.1.2770",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 141e1d4aa281b021933449b439f014ebc6c9f8c1 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 22 Jun 2016 11:08:54 +0200
Subject: [PATCH 300/303] c9-auto-bump 3.1.2771

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d29d720f..907dfc8c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2770",
+    "version": "3.1.2771",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From a05733f7780cbd351d6ec256f10f6b4ab5eaee8f Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 22 Jun 2016 11:11:51 +0200
Subject: [PATCH 301/303] c9-auto-bump 3.1.2772

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 907dfc8c..eca0dcbb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2771",
+    "version": "3.1.2772",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 31e3dcdcd1dd8c16263263d0e39ed62f5fc4443a Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 22 Jun 2016 11:26:16 +0200
Subject: [PATCH 302/303] c9-auto-bump 3.1.2773

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index eca0dcbb..809aacf9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2772",
+    "version": "3.1.2773",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From e8c33876c0814fb277fa8f9e128004bd43ae154c Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 22 Jun 2016 11:37:50 +0200
Subject: [PATCH 303/303] c9-auto-bump 3.1.2774

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 809aacf9..ca7c6573 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2773",
+    "version": "3.1.2774",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",