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

diff --git a/js/panels/css-panel/css-panel.reel/css-panel.js b/js/panels/css-panel/css-panel.reel/css-panel.js
index 96d94b36..a2a288c9 100644
--- a/js/panels/css-panel/css-panel.reel/css-panel.js
+++ b/js/panels/css-panel/css-panel.reel/css-panel.js
@@ -9,6 +9,16 @@ var Montage = require("montage/core/core").Montage,
 
 exports.CssPanel = Montage.create(Component, {
 
+    styleSheetsView: {
+        value: null,
+        serializable: true
+    },
+
+    stylesViewContainer: {
+        value: null,
+        serializable: true
+    },
+
     _currentDocument: {
         value : null
     },