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

diff --git a/node_modules/montage/ui/tabs.reel/tabs.js b/node_modules/montage/ui/tabs.reel/tabs.js
index 60b18480..4836e455 100755
--- a/node_modules/montage/ui/tabs.reel/tabs.js
+++ b/node_modules/montage/ui/tabs.reel/tabs.js
@@ -27,13 +27,14 @@ var Montage = require("montage").Montage,
 
 var Tabs = exports.Tabs = Montage.create(Component, /** @lends module:"montage/ui/tabs.reel".Tabs# */ {
 
-    hasTemplate: {
-        value: true
+    _repetition: {
+        value: null,
+        serializable: true
     },
 
-    _repetition: {
-        enumerable: false,
-        value: null
+    _indicator: {
+        value: null,
+        serializable: true
     },
 /**
         Description TODO
@@ -41,13 +42,14 @@ var Tabs = exports.Tabs = Montage.create(Component, /** @lends module:"montage/u
         @default {Array} []
     */
     tabs: {
-        enumerable: false,
         distinct: true,
+        serializable: true,
         value: []
     },
 
     navController: {
-        value: null
+        value: null,
+        serializable: true
     },
     // optional property. If provided, this will result in wiring tab clicks to switching components in content
     /**
@@ -57,6 +59,7 @@ var Tabs = exports.Tabs = Montage.create(Component, /** @lends module:"montage/u
     */
     content: {
         enumerable: false,
+        serializable: true,
         value: null
     },
 
@@ -87,13 +90,13 @@ var Tabs = exports.Tabs = Montage.create(Component, /** @lends module:"montage/u
                 var index = this._indexOf(value);
                 this.navController.selectedIndexes = [index];
             }
-        }
+        },
+        serializable: true
     },
 
 
     _selectedTab: {value: null},
     selectedTab: {
-        distinct: true,
         enumerable: false,
         get: function() {
             return this._selectedTab;