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, 10 insertions, 2 deletions

diff --git a/js/components/tools-properties/zoom-properties.reel/zoom-properties.js b/js/components/tools-properties/zoom-properties.reel/zoom-properties.js
index b8d6eb6b..020e238c 100755
--- a/js/components/tools-properties/zoom-properties.reel/zoom-properties.js
+++ b/js/components/tools-properties/zoom-properties.reel/zoom-properties.js
@@ -10,8 +10,16 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T
 
 exports.ZoomProperties = Montage.create(ToolProperties, {
 
-    zoomIn:     { value: null },
-    zoomOut:    { value: null },
+    zoomIn: {
+        value: null,
+        serializable: true
+    },
+
+    zoomOut: {
+        value: null,
+        serializable: true
+    },
+
     zoomInCursor:{value:"url('images/cursors/zoom.png'), default"},
     zoomOutCursor:{value:"url('images/cursors/zoom_minus.png'), default"},
     _subPrepare: {