Merge branch 'refs/heads/master' into montage-v10-integration

Conflicts:
	js/io/system/ninjalibrary.json
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/js/tools/TranslateObject3DTool.js b/js/tools/TranslateObject3DTool.js
index f8b32d23..d9e558a4 100755
--- a/js/tools/TranslateObject3DTool.js
+++ b/js/tools/TranslateObject3DTool.js
@@ -89,7 +89,7 @@ exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, {
                         var otherSnap = snapManager.findHitRecordForElement(elt);
                                                 if (otherSnap)  hitRec = otherSnap;
                     }
-                    if(elt === this.application.ninja.currentSelectedContainer)
+                    if(elt === this.application.ninja.currentDocument.model.domContainer)
                     {
                         this._clickedOnStage = true;
                     }