Merge branch 'binding' of github.com:dhg637/ninja-internal into binding

Conflicts:
	js/stage/binding-view.reel/binding-view.js

1 files changed, 8 insertions, 2 deletions

diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 8b6826ed..dda06028 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -9,8 +9,14 @@ var Component = require("montage/ui/component").Component;
 
 var Tween = exports.Tween = Montage.create(Component, {
 
-    hasTemplate:{
-        value: true
+    keyframe: {
+        value: null,
+        serializable: true
+    },
+
+    tweenspan: {
+        value: null,
+        serializable: true
     },
 
     _tweenData:{