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, 14 insertions, 1 deletions

diff --git a/js/panels/presets/content.reel/content.js b/js/panels/presets/content.reel/content.js
index 1ede7246..eba150c3 100644
--- a/js/panels/presets/content.reel/content.js
+++ b/js/panels/presets/content.reel/content.js
@@ -14,6 +14,10 @@ exports.content = Montage.create(Component, {
     contentPanel : {
         value: null
     },
+    activeTabIndex: {
+        value: null,
+        serializable: true
+    },
     templateDidLoad : {
         value: function() {
             var storedTabIndex = this.application.localStorage.getItem("presetsTabIndex");
@@ -55,7 +59,16 @@ exports.content = Montage.create(Component, {
             this._activeTab = tabObject;
 
             this.needsDraw = this._needsTabSwitch = true;
-        }
+        },
+        serializable: true
+    },
+    tabBar: {
+        value: null,
+        serializable: true
+    },
+    tabs:{
+        value: null,
+        serializable: true
     },
     _tabToDeactivate : {
         value: null,