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, 3 insertions, 3 deletions

diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index f0fb1a45..c6d46911 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -18,8 +18,7 @@ exports.Splitter = Montage.create(Component, {
     },
 
     _panel: {
-        value: null,
-        enumerable:true
+        value: null
     },
 
     panel: {
@@ -41,7 +40,8 @@ exports.Splitter = Montage.create(Component, {
         },
         set: function(val) {
             this._resizeBar = val;
-        }
+        },
+        serializable: true
     },
 
     _collapsed : {