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

diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.js b/js/components/tools-properties/object3d-properties.reel/object3d-properties.js
index d7f0976c..33ef3394 100755
--- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.js
+++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.js
@@ -10,8 +10,15 @@ var defaultEventManager = require("montage/core/event/event-manager").defaultEve
 var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
 
 exports.Object3DProperties = Montage.create(ToolProperties, {
-    rotateLocally: { value: null, enumerable: false },
-    rotateGlobally: { value: null, enumerable: false },
+    rotateLocally: {
+        value: null,
+        serializable: true
+    },
+
+    rotateGlobally: {
+        value: null,
+        serializable: true
+    },
 
     _subPrepare: {
         value: function () {