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

diff --git a/js/panels/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer.reel/PanelContainer.js
index 82069146..e0e547f9 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.js
+++ b/js/panels/PanelContainer.reel/PanelContainer.js
@@ -12,8 +12,54 @@ var Montage         = require("montage/core/core").Montage,
  
 exports.PanelContainer = Montage.create(Component, {
 
+    panelSplitter: {
+        value: null,
+        serializable: true
+    },
+
+    appModel: {
+        value: null,
+        serializable: true
+    },
+
     panelData: {
-        value: null
+        value: null,
+        serializable: true
+    },
+
+    panel_0: {
+        value: null,
+        serializable: true
+    },
+
+    panel_1: {
+        value: null,
+        serializable: true
+    },
+
+    panel_2: {
+        value: null,
+        serializable: true
+    },
+
+    panel_3: {
+        value: null,
+        serializable: true
+    },
+
+    panel_4: {
+        value: null,
+        serializable: true
+    },
+
+    panel_5: {
+        value: null,
+        serializable: true
+    },
+
+    panel_6: {
+        value: null,
+        serializable: true
     },
 
     _currentDocument: {