diff --git a/node_modules/ace/lib/ace/editor.js b/node_modules/ace/lib/ace/editor.js
index 1dc7321b..1768c0a2 100644
--- a/node_modules/ace/lib/ace/editor.js
+++ b/node_modules/ace/lib/ace/editor.js
@@ -275,6 +275,10 @@ var Editor = function(renderer, session) {
     this.setSession = function(session) {
         if (this.session == session)
             return;
+        
+        // make sure operationEnd events are not emitted to wrong session
+        if (this.curOp) this.endOperation();
+        this.curOp = {};
 
         var oldSession = this.session;
         if (oldSession) {
@@ -372,6 +376,8 @@ var Editor = function(renderer, session) {
             oldSession: oldSession
         });
         
+        this.curOp = null;
+        
         oldSession && oldSession._signal("changeEditor", {oldEditor: this});
         session && session._signal("changeEditor", {editor: this});
     };
diff --git a/node_modules/ace/lib/ace/selection.js b/node_modules/ace/lib/ace/selection.js
index b712fc6b..ed57682f 100644
--- a/node_modules/ace/lib/ace/selection.js
+++ b/node_modules/ace/lib/ace/selection.js
@@ -923,7 +923,7 @@ var Selection = function(session) {
                 this.toSingleRange(data[0]);
                 for (var i = data.length; i--; ) {
                     var r = Range.fromPoints(data[i].start, data[i].end);
-                    if (data.isBackwards)
+                    if (data[i].isBackwards)
                         r.cursor = r.start;
                     this.addRange(r, true);
                 }
diff --git a/package.json b/package.json
index 2e54d29f..3d123598 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
         "c9.ide.collab": "#7009f69cb0",
         "c9.ide.local": "#2bfd7ff051",
         "c9.ide.find": "#989c06e6a7",
-        "c9.ide.find.infiles": "#f98dfef554",
+        "c9.ide.find.infiles": "#1b83cf12f1",
         "c9.ide.find.replace": "#e4daf722b8",
         "c9.ide.run.debug": "#5b3e30ce44",
         "c9.ide.ace.emmet": "#e5f1a92ac3",
@@ -78,7 +78,7 @@
         "c9.ide.configuration": "#b8470f4107",
         "c9.ide.dialog.wizard": "#a588b64050",
         "c9.ide.fontawesome": "#781602c5d8",
-        "c9.ide.format": "#4295dcca4d",
+        "c9.ide.format": "#f51451ac57",
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
@@ -96,6 +96,7 @@
         "c9.ide.remote": "#f531d62cfb",
         "c9.ide.run": "#dd21c8c310",
         "c9.ide.run.build": "#915e48b363",
+        "c9.ide.run.debug.xdebug": "#b91d23f48b",
         "c9.ide.save": "#a32a8f4346",
         "c9.ide.terminal.monitor": "#b0b4d03280",
         "c9.ide.theme.flat": "#b1d65fa9bb",
diff --git a/plugins/c9.ide.ui/lib_apf.js b/plugins/c9.ide.ui/lib_apf.js
index c7893793..4d12f382 100644
--- a/plugins/c9.ide.ui/lib_apf.js
+++ b/plugins/c9.ide.ui/lib_apf.js
@@ -9016,6 +9016,9 @@ var modules = {
     boxFlex: function(oHtml, value, center) {
         oHtml.style[apf.CSS_FLEX_PROP] = value;
     },
+    boxFlexGrow: function(oHtml, value, center) {
+        oHtml.style[apf.CSS_FLEX_PROP + "-grow"] = value;
+    },
     "height-rsz": function(oHtml, value, center) {
         oHtml.style.height = value + PX;
         if (apf.hasSingleResizeEvent && apf.layout.$onresize)