Merge branch 'refs/heads/master' into binding

Conflicts:
	js/ninja.reel/ninja.html

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index cce053bc..c7288d28 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -115,7 +115,7 @@ exports.KeyboardMediator = Montage.create(Component, {
 
 
                 // Shortcut for Selection Tool is V
-                if(evt.keyCode === Keyboard.V) {
+                if((evt.keyCode === Keyboard.V) && !(evt.ctrlKey || evt.metaKey)) {
                     evt.preventDefault();
                     this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex] });
                     return;