Merge branch 'master' into master-redesign

Conflicts:
	public/js/ace/mode/latex.js

services/web/public/js/ace/mode-latex.js

@@ -180,6 +180,7 @@ var Mode = function() {
 oop.inherits(Mode, TextMode);
 
 (function() {
+    this.type = "text";
     this.lineCommentStart = "%";
 
     this.$id = "ace/mode/latex";