Merge branch 'refs/heads/TimelineUber' into TimelineProps

Conflicts:
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 14 insertions, 0 deletions

diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 45714079..c733b8d7 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -132,6 +132,20 @@ var Tween = exports.Tween = Montage.create(Component, {
             this._isTweenAnimated = value;
         }
     },
+    
+    _isDragging: {
+        value: false
+    },
+    isDragging: {
+        serializable: true,
+        get:function () {
+            return this._isDragging;
+        },
+        set:function (newVal) {
+            this._isDragging = newVal;
+        }
+        
+    },
 
 
     draw:{