Merge branch 'refs/heads/master' into binding

Conflicts:
	js/components/layout/tools-list.reel/tools-list.html
	js/components/layout/tools-properties.reel/tools-properties.html
	js/document/document-html.js
	js/document/templates/app/main.js
	js/panels/Panel.reel/Panel.js
	node_modules/montage/ui/native-control.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 22 insertions, 22 deletions

diff --git a/js/components/tools-properties/text-properties.reel/text-properties.js b/js/components/tools-properties/text-properties.reel/text-properties.js
index 35d46cc7..72a6f034 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.js
+++ b/js/components/tools-properties/text-properties.reel/text-properties.js
@@ -10,28 +10,28 @@ var ArrayController = require("montage/ui/controller/array-controller").ArrayCon
 var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
 
 exports.TextProperties = Montage.create(ToolProperties, {
-    className: {value: null},
-    tagType: {value: null},
-    fontSelection: {value: null},
-    fontSettings: {value: null},
-    fontSize: {value: null},
-    fontColor: {value: null},
-    btnBold: {value: null},
-    btnItalic: {value: null},
-    btnUnderline: {value: null},
-    btnStrikethrough: {value: null},
-    txtLink: {value: null},
-    linkTarget: {value: null},
-    alignLeft: {value: null},
-    alignCenter: {value: null},
-    alignRight: {value: null},
-    alignJustify: {value: null},
-    indent: {value: null},
-    outdent: {value: null},
-    numberedList: {value: null},
-    bulletedList: {value: null},
-    fontTypes: {value: null},
-    fontSizes: {value: null},
+    className: {value: null, serializable: true},
+    tagType: {value: null, serializable: true},
+    fontSelection: {value: null, serializable: true},
+    fontSettings: {value: null, serializable: true},
+    fontSize: {value: null, serializable: true},
+    fontColor: {value: null, serializable: true},
+    btnBold: {value: null, serializable: true},
+    btnItalic: {value: null, serializable: true},
+    btnUnderline: {value: null, serializable: true},
+    btnStrikethrough: {value: null, serializable: true},
+    txtLink: {value: null, serializable: true},
+    linkTarget: {value: null, serializable: true},
+    alignLeft: {value: null, serializable: true},
+    alignCenter: {value: null, serializable: true},
+    alignRight: {value: null, serializable: true},
+    alignJustify: {value: null, serializable: true},
+    indent: {value: null, serializable: true},
+    outdent: {value: null, serializable: true},
+    numberedList: {value: null, serializable: true},
+    bulletedList: {value: null, serializable: true},
+    fontTypes: {value: null, serializable: true},
+    fontSizes: {value: null, serializable: true},
 
     prepareForDraw: {
         value: function() {