Merge branch 'refs/heads/NinjaInternal' into Color

Conflicts:
	js/controllers/elements/shapes-controller.js
	js/data/pi/pi-data.js
	js/panels/properties/content.reel/content.js

1 files changed, 6 insertions, 0 deletions

diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 144932c0..a1fdead3 100644
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -178,6 +178,12 @@ exports.KeyboardMediator = Montage.create(Component, {
                 return;
             }
 
+            if(evt.keyCode === Keyboard.H ) {
+                evt.preventDefault();
+                this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[15]});
+                return;
+            }
+
             if(evt.keyCode === Keyboard.Z ) {
                 evt.preventDefault();
                 this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[16]});