Merge remote-tracking branch 'ninja-internal/master' into test-merge

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js

1 files changed, 19 insertions, 0 deletions

diff --git a/js/panels/css-panel/styles-view-container.reel/styles-view-container.js b/js/panels/css-panel/styles-view-container.reel/styles-view-container.js
index 157d99de..153e74b6 100644
--- a/js/panels/css-panel/styles-view-container.reel/styles-view-container.js
+++ b/js/panels/css-panel/styles-view-container.reel/styles-view-container.js
@@ -9,6 +9,21 @@ var Montage = require("montage/core/core").Montage,
 
 exports.StylesViewContainer = Montage.create(Component, {
 
+    ruleListContainer: {
+        value: null,
+        serializable: true
+    },
+
+    computedStyleView: {
+        value: null,
+        serializable: true
+    },
+
+    toolbar: {
+        value: null,
+        serializable: true
+    },
+
     _currentDocument: {
         value : null
     },
@@ -37,6 +52,10 @@ exports.StylesViewContainer = Montage.create(Component, {
     contentPanel : {
         value: 'rules'
     },
+    selectionName: {
+        value: null,
+        serializable: true
+    },
     _selectionNameLabelText : {
         value: null
     },