Merge branch 'refs/heads/ninja-internal-master' into FileIO

Conflicts:
	js/controllers/selection-controller.js
	js/document/html-document.js
	js/panels/properties/content.reel/content.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 158d666e..26d045d6 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -62,6 +62,11 @@
                                "boundObject" : {"@": "tweenRepetition"},
                                "boundObjectPropertyPath" : "objectAtCurrentIteration.isTweenAnimated",
                                "oneway" : false
+                           },
+                           "isClearing" : {
+                               "boundObject" : {"@": "tweenRepetition"},
+                               "boundObjectPropertyPath" : "objectAtCurrentIteration.isClearing",
+                               "oneway" : false
                            }
                        }
                    },