diff --git a/.jsbeautifyrc b/.jsbeautifyrc
index 93e2e835..222ca5f6 100644
--- a/.jsbeautifyrc
+++ b/.jsbeautifyrc
@@ -1,47 +1,57 @@
 {
-    "css": {
-        "indent_size": 4,
-        "allowed_file_extensions": ["css", "scss", "sass", "less"]
-    },
-    "html": {
-        "indent_size": 4,
-        "indent_char": " ",
-        "preserve_newlines": true,
-        "wrap_line_length": 0,
-        "indent_handlebars": true,
-        "indent_inner_html": false,
-        "indent_scripts": "keep"
-    },
-    "hbs": {
-        "indent_size": 4,
-        "indent_char": " ",
-        "preserve_newlines": true,
-        "wrap_line_length": 0
-    },
-    "js": {
-        "indent_size": 4,
-        "indent_char": " ",
-        "preserve_newlines": true,
-        "wrap_line_length": 0,
-        "break_chained_methods": false,
-        "indent_with_tabs": false,
-        "max_preserve_newlines": 2,
-        "jslint_happy": true,
-        "brace_style": "collapse-preserve-inline",
-        "space_after_anon_function": false,
-        "keep_function_indentation": false,
-        "space_before_conditional": true
-    },
-    "sql": {
-        "indent_size": 4,
-        "indent_char": " ",
-        "indent_level": 0,
-        "indent_with_tabs": false
-    },
-    "_default": {
-        "indent_size": 4,
-        "indent_char": " ",
-        "preserve_newlines": true,
-        "wrap_line_length": 0
-    }
+	"css": {
+		"indent_size": 4,
+		"indent_level": 0,
+		"indent_with_tabs": true,
+		"allowed_file_extensions": ["css", "scss", "sass", "less"],
+		"max_preserve_newlines": 2
+	},
+	"html": {
+		"indent_size": 4,
+		"indent_level": 0,
+		"indent_with_tabs": true,
+		"preserve_newlines": true,
+		"max_preserve_newlines": 2,
+		"wrap_line_length": 0,
+		"indent_handlebars": true,
+		"indent_inner_html": false,
+		"indent_scripts": "keep"
+	},
+	"hbs": {
+		"indent_size": 4,
+		"indent_level": 0,
+		"indent_with_tabs": true,
+		"max_preserve_newlines": 2,
+		"preserve_newlines": true,
+		"wrap_line_length": 0
+	},
+	"js": {
+		"indent_size": 4,
+		"indent_level": 0,
+		"indent_with_tabs": true,
+		"preserve_newlines": true,
+		"wrap_line_length": 0,
+		"break_chained_methods": false,
+		"max_preserve_newlines": 2,
+		"jslint_happy": true,
+		"brace_style": "collapse-preserve-inline",
+		"keep_function_indentation": false,
+		"space_after_anon_function": false,
+		"space_before_conditional": true,
+		"space_in_empty_paren": false,
+		"space_in_paren": false
+	},
+	"sql": {
+		"indent_size": 4,
+		"indent_level": 0,
+		"indent_with_tabs": true
+	},
+	"_default": {
+		"indent_size": 4,
+		"indent_level": 0,
+		"indent_with_tabs": true,
+		"preserve_newlines": true,
+		"max_preserve_newlines": 2,
+		"wrap_line_length": 0
+	}
 }
\ No newline at end of file
diff --git a/app/app/components/section/base-editor.js b/app/app/components/section/base-editor.js
index 3d17c7e3..7f077ced 100644
--- a/app/app/components/section/base-editor.js
+++ b/app/app/components/section/base-editor.js
@@ -12,80 +12,80 @@
 import Ember from 'ember';
 
 export default Ember.Component.extend({
-    drop: null,
-    cancelLabel: "Close",
-    actionLabel: "Save",
-    tip: "Short and concise title for the page",
-    busy: false,
+	drop: null,
+	cancelLabel: "Close",
+	actionLabel: "Save",
+	tip: "Short and concise title for the page",
+	busy: false,
 
-    didRender() {
-        let self = this;
-        Mousetrap.bind('esc', function() {
-            self.send('onCancel');
-            return false;
-        });
-        Mousetrap.bind(['ctrl+s', 'command+s'], function() {
-            self.send('onAction');
-            return false;
-        });
+	didRender() {
+		let self = this;
+		Mousetrap.bind('esc', function () {
+			self.send('onCancel');
+			return false;
+		});
+		Mousetrap.bind(['ctrl+s', 'command+s'], function () {
+			self.send('onAction');
+			return false;
+		});
 
-        $("#page-title").removeClass("error");
-    },
+		$("#page-title").removeClass("error");
+	},
 
-    willDestroyElement() {
-        let drop = this.get('drop');
+	willDestroyElement() {
+		let drop = this.get('drop');
 
-        if (is.not.null(drop)) {
-            drop.destroy();
-        }
-    },
+		if (is.not.null(drop)) {
+			drop.destroy();
+		}
+	},
 
-    actions: {
-        onCancel() {
-            if (this.attrs.isDirty() !== null && this.attrs.isDirty()) {
-                $(".discard-edits-dialog").css("display", "block");
+	actions: {
+		onCancel() {
+			if (this.attrs.isDirty() !== null && this.attrs.isDirty()) {
+				$(".discard-edits-dialog").css("display", "block");
 
-                let drop = new Drop({
-                    target: $("#editor-cancel")[0],
-                    content: $(".cancel-edits-dialog")[0],
-                    classes: 'drop-theme-basic',
-                    position: "bottom right",
-                    openOn: "always",
-                    tetherOptions: {
-                        offset: "5px 0",
-                        targetOffset: "10px 0"
-                    },
-                    remove: false
-                });
+				let drop = new Drop({
+					target: $("#editor-cancel")[0],
+					content: $(".cancel-edits-dialog")[0],
+					classes: 'drop-theme-basic',
+					position: "bottom right",
+					openOn: "always",
+					tetherOptions: {
+						offset: "5px 0",
+						targetOffset: "10px 0"
+					},
+					remove: false
+				});
 
-                this.set('drop', drop);
+				this.set('drop', drop);
 
-                return;
-            }
+				return;
+			}
 
-            this.attrs.onCancel();
-        },
+			this.attrs.onCancel();
+		},
 
-        onAction() {
-            if (this.get('busy')) {
-                return;
-            }
+		onAction() {
+			if (this.get('busy')) {
+				return;
+			}
 
-            if (is.empty(this.get('page.title'))) {
-                $("#page-title").addClass("error").focus();
-                return;
-            }
+			if (is.empty(this.get('page.title'))) {
+				$("#page-title").addClass("error").focus();
+				return;
+			}
 
-            this.attrs.onAction(this.get('page.title'));
-        },
+			this.attrs.onAction(this.get('page.title'));
+		},
 
-        keepEditing() {
-            let drop = this.get('drop');
-            drop.close();
-        },
+		keepEditing() {
+			let drop = this.get('drop');
+			drop.close();
+		},
 
-        discardEdits() {
-            this.attrs.onCancel();
-        }
-    }
-});
+		discardEdits() {
+			this.attrs.onCancel();
+		}
+	}
+});
\ No newline at end of file
diff --git a/app/app/components/section/code/type-editor.js b/app/app/components/section/code/type-editor.js
index 599ed147..f54d66f0 100644
--- a/app/app/components/section/code/type-editor.js
+++ b/app/app/components/section/code/type-editor.js
@@ -1,11 +1,11 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
@@ -129,4 +129,4 @@ export default Ember.Component.extend(TooltipMixin, {
             this.attrs.onAction(page, meta);
         }
     }
-});
\ No newline at end of file
+});
diff --git a/app/app/index.html b/app/app/index.html
index 9a6174b3..1fc7fc56 100644
--- a/app/app/index.html
+++ b/app/app/index.html
@@ -1,32 +1,32 @@
 <!DOCTYPE html>
 <html>
 
-<head>
-    {{content-for 'head'}}
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>Documize</title>
-    <meta property="dbname" content="{{.DBname}}" />
-    <meta property="dbhash" content="{{.DBhash}}" />
-    <meta name="author" content="Documize" />
-    <meta name="description" content="Documize">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-    <link rel="shortcut icon" href="/favicon.ico?v=1.1" />
-    <link rel="icon" type="image/png" href="/favicon-32x32.png?v=1.1" sizes="32x32" />
-    <link rel="stylesheet" href="assets/vendor.css">
-    <link rel="stylesheet" href="assets/documize.css"> {{content-for 'head-footer'}}
-</head>
+	<head>
+		{{content-for 'head'}}
+		<meta charset="utf-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<title>Documize</title>
+		<meta property="dbname" content="{{.DBname}}" />
+		<meta property="dbhash" content="{{.DBhash}}" />
+		<meta name="author" content="Documize" />
+		<meta name="description" content="Documize">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+		<link rel="shortcut icon" href="/favicon.ico?v=1.1" />
+		<link rel="icon" type="image/png" href="/favicon-32x32.png?v=1.1" sizes="32x32" />
+		<link rel="stylesheet" href="assets/vendor.css">
+		<link rel="stylesheet" href="assets/documize.css"> {{content-for 'head-footer'}}
+	</head>
 
-<body>
-    {{content-for 'body'}}
-    <script src="assets/vendor.js"></script>
-    <script src="assets/documize.js"></script>
-    <script src="codemirror/lib/codemirror.js"></script>
-    <script src="codemirror/mode/meta.js"></script>
-    <script src="codemirror/addon/mode/loadmode.js"></script>
-    <script src="codemirror/addon/runmode/runmode.js"></script>
-    <script src="codemirror/addon/runmode/colorize.js"></script>
-    {{content-for 'body-footer'}}
-</body>
+	<body>
+		{{content-for 'body'}}
+		<script src="assets/vendor.js"></script>
+		<script src="assets/documize.js"></script>
+		<script src="codemirror/lib/codemirror.js"></script>
+		<script src="codemirror/mode/meta.js"></script>
+		<script src="codemirror/addon/mode/loadmode.js"></script>
+		<script src="codemirror/addon/runmode/runmode.js"></script>
+		<script src="codemirror/addon/runmode/colorize.js"></script>
+		{{content-for 'body-footer'}}
+	</body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/documize/api/endpoint/router.go b/documize/api/endpoint/router.go
index eeff52fb..d0bb88c9 100644
--- a/documize/api/endpoint/router.go
+++ b/documize/api/endpoint/router.go
@@ -30,7 +30,7 @@ const (
 	// AppVersion does what it says
 	// Versioning scheme major.minor where "minor" is optional
 	// e.g. 1, 2, 3, 4.1, 4.2, 5, 6, 7, 7.1, 8, 9, 10, ..... 127, 127.1, 128
-	AppVersion = "12.9"
+	AppVersion = "13.1"
 )
 
 var port, certFile, keyFile, forcePort2SSL string