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

diff --git a/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js b/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js
index 9e3b4a49..c090a1fc 100644
--- a/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js
+++ b/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js
@@ -8,13 +8,24 @@ var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component;
 
 exports.StyleSheetsView = Montage.create(Component, {
+
+    toolbar: {
+        value: null,
+        serializable: true
+    },
+
+    styleSheetList: {
+        value: null,
+        serializable: true
+    },
+
     documentLoaded       : { value: false },
     showToolbar          : { value: false },
     stylesController     : { value: null },
     styleSheets          : { value: [] },
     _initView            : { value: false },
     _needsScroll         : { value: false },
-    documentNameLabel    : { value: null },
+    documentNameLabel    : { value: null, serializable: true },
     noDocumentLabelClass : { value: "no-document" },
 
     _activeDocument: {