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

diff --git a/node_modules/montage/ui/list.reel/list.js b/node_modules/montage/ui/list.reel/list.js
index 02c91093..63ff09a2 100755
--- a/node_modules/montage/ui/list.reel/list.js
+++ b/node_modules/montage/ui/list.reel/list.js
@@ -15,13 +15,13 @@ var Montage = require("montage").Montage,
  @extends module:montage/ui/component.Component
  */
 var List = exports.List = Montage.create(Component,/** @lends module:"montage/ui/list.reel".List# */ {
-/**
-  Description TODO
-  @private
-*/
+    /**
+      Description TODO
+      @private
+    */
     _repetition: {
-        enumerable: false,
-        value: null
+        value: null,
+        serializable: true
     },
     /**
         Description TODO
@@ -29,19 +29,22 @@ var List = exports.List = Montage.create(Component,/** @lends module:"montage/ui
         @default null
     */
     delegate: {
-        enumerable: false,
+        serializable: true,
         value: null
     },
-    
+
     objects: {
+        serializable: true,
         value: null
     },
-    
+
     contentController: {
+        serializable: true,
         value: null
     },
-    
+
     axis: {
+        serializable: true,
         value: null
     },
 
@@ -50,6 +53,7 @@ var List = exports.List = Montage.create(Component,/** @lends module:"montage/ui
   @private
 */
     isSelectionEnabled: {
+        serializable: true,
         value: null
     },