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

diff --git a/js/panels/css-panel/styles-view-delegate.js b/js/panels/css-panel/styles-view-delegate.js
index 87686826..a7c1f0d9 100644
--- a/js/panels/css-panel/styles-view-delegate.js
+++ b/js/panels/css-panel/styles-view-delegate.js
@@ -9,6 +9,12 @@ var Montage = require("montage/core/core").Montage,
     Keyboard = require("js/mediators/keyboard-mediator").Keyboard;
 
 exports.StylesViewDelegate = Montage.create(Component, {
+
+    ruleListContainer: {
+        value: null,
+        serializable: true
+    },
+
     newClassPrefix      : { value: "new-class" },
     elementOutlineClass : { value: "nj-element-highlight" },