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, 7 insertions, 4 deletions

diff --git a/node_modules/montage/ui/bluemoon/progress.reel/progress.js b/node_modules/montage/ui/bluemoon/progress.reel/progress.js
index 20c60d94..d7661445 100644
--- a/node_modules/montage/ui/bluemoon/progress.reel/progress.js
+++ b/node_modules/montage/ui/bluemoon/progress.reel/progress.js
@@ -20,7 +20,7 @@ exports.Progress = Montage.create(Component,/** @lends module:"montage/ui/bluemo
   @private
 */
     _barElement: {
-        enumerable: false,
+        serializable: true,
         value: null
     },
 /**
@@ -51,7 +51,8 @@ exports.Progress = Montage.create(Component,/** @lends module:"montage/ui/bluemo
                 }
                 this.needsDraw = true;
             }
-        }
+        },
+        serializable: true
     },
 /**
   Description TODO
@@ -78,7 +79,8 @@ exports.Progress = Montage.create(Component,/** @lends module:"montage/ui/bluemo
                 }
                 this.needsDraw = true;
             }
-        }
+        },
+        serializable: true
     },
 /**
   Description TODO
@@ -111,7 +113,8 @@ exports.Progress = Montage.create(Component,/** @lends module:"montage/ui/bluemo
                 this._scrolling = value;
                 this.needsDraw = true;
             }
-        }
+        },
+        serializable: true
     },
 /**
     Description TODO