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

2 files changed, 32 insertions, 1 deletions

diff --git a/js/panels/css-panel/style-sheet.reel/style-sheet.html b/js/panels/css-panel/style-sheet.reel/style-sheet.html
index 7e27dd93..d08453fa 100644
--- a/js/panels/css-panel/style-sheet.reel/style-sheet.html
+++ b/js/panels/css-panel/style-sheet.reel/style-sheet.html
@@ -27,7 +27,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "properties": {
                     "element": {"#": "sheet-name"},
                     "identifier": "nameText",
-                    "defaultText": "Style sheet"
+                    "defaultValue": "Style sheet"
                 },
                 "bindings": {
                     "value": {"<-": "@owner.name"}
diff --git a/js/panels/css-panel/style-sheet.reel/style-sheet.js b/js/panels/css-panel/style-sheet.reel/style-sheet.js
index cb69d25b..8ce8da0e 100644
--- a/js/panels/css-panel/style-sheet.reel/style-sheet.js
+++ b/js/panels/css-panel/style-sheet.reel/style-sheet.js
@@ -8,6 +8,37 @@ var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component;
 
 exports.StyleSheet = Montage.create(Component, {
+
+    nameText: {
+        value: null,
+        serializable: true
+    },
+
+    mediaInput: {
+        value: null,
+        serializable: true
+    },
+
+    editButton: {
+        value: null,
+        serializable: true
+    },
+
+    editView: {
+        value: null,
+        serializable: true
+    },
+
+    disableButton: {
+        value: null,
+        serializable: true
+    },
+
+    deleteButton: {
+        value: null,
+        serializable: true
+    },
+
     _translateDistance: {
         value: null
     },