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

diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index f0fb1a45..c6d46911 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -18,8 +18,7 @@ exports.Splitter = Montage.create(Component, {
     },
 
     _panel: {
-        value: null,
-        enumerable:true
+        value: null
     },
 
     panel: {
@@ -41,7 +40,8 @@ exports.Splitter = Montage.create(Component, {
         },
         set: function(val) {
             this._resizeBar = val;
-        }
+        },
+        serializable: true
     },
 
     _collapsed : {