Merge remote-tracking branch 'origin/master' into highlighting/mixed

Conflicts:
	index.html

lib/ace/css/editor.css

@@ -5,6 +5,10 @@
     font-size: 12px;
     line-height: normal;
     color: black;
+    -ms-user-select: none;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    user-select: none;
 }
 
 .ace_scroller {
@@ -23,6 +27,28 @@
     cursor: text;
 }
 
+.ace_dragging, .ace_dragging * {
+    cursor: move !important;
+}
+
+.ace_dragging .ace_scroller:before{
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    content: '';
+    background: rgba(250, 250, 250, 0.01);
+    z-index: 1000;
+}
+.ace_dragging.ace_dark .ace_scroller:before{
+    background: rgba(0, 0, 0, 0.01);
+}
+
+.ace_selecting, .ace_selecting * {
+    cursor: text !important;
+}
+
 .ace_gutter {
     position: absolute;
     overflow : hidden;
@@ -268,10 +294,6 @@
     background-position: center center, top left;
 }
 
-.ace_editor.ace_dragging .ace_content {
-    cursor: move;
-}
-
 .ace_gutter-tooltip {
     background-color: #FFF;
     background-image: -webkit-linear-gradient(top, transparent, rgba(0, 0, 0, 0.1));