Merge branch 'refs/heads/NINJA-master' into TimelineUber

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
	js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css

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

1 files changed, 0 insertions, 2 deletions

diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 923ed819..a136113b 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -102,7 +102,6 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
             }
 
             this.isDrawing = true;
-            this.application.ninja.stage.showSelectionBounds = false;
 
             this._use3DMode = false;
 
@@ -183,7 +182,6 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
                 point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY));
 
             this.isDrawing = false;
-            this.application.ninja.stage.showSelectionBounds = true;
             if(this._escape) {
                 this._escape = false;
                 this._isSelecting = false;