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

diff --git a/js/components/slider.reel/slider.js b/js/components/slider.reel/slider.js
index fced8aad..b2af1f9a 100755
--- a/js/components/slider.reel/slider.js
+++ b/js/components/slider.reel/slider.js
@@ -9,6 +9,21 @@ var SliderBase = require("js/components/sliderbase").SliderBase;
 
 var Slider = exports.Slider = Montage.create(SliderBase, {
 
+    parentDiv: {
+        value: null,
+        serializable: true
+    },
+
+    track: {
+        value: null,
+        serializable: true
+    },
+
+    knob: {
+        value: null,
+        serializable: true
+    },
+
     // "horizontal" or "vertical"
     _direction: {
         enumerable: true,