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, 4 insertions, 2 deletions

diff --git a/js/panels/resize-composer.js b/js/panels/resize-composer.js
index 2278623f..33e42511 100644
--- a/js/panels/resize-composer.js
+++ b/js/panels/resize-composer.js
@@ -10,11 +10,13 @@ var Composer = require("montage/ui/composer/composer").Composer;
 exports.ResizeComposer = Montage.create(Composer, {
 
     xAxis: {
-        value: true
+        value: true,
+        serializable: true
     },
 
     yAxis: {
-        value: true
+        value: true,
+        serializable: true
     },
 
     enabled : {