Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into text-tool

Conflicts:
	_scss/compass_app_log.txt
	css/ninja.css

1 files changed, 3 insertions, 3 deletions

diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 8ea84574..de965dbc 100644
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -37,7 +37,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "rotate3DProperties",
                 "spriteSheet":  true,
                 "action":       "Rotate3DTool",
-                "toolTip":      "3D Rotate Object Tool",
+                "toolTip":      "3D Rotate Object Tool (W)",
                 "cursor":       "auto",
                 "lastInGroup":  false,
                 "container":    false,
@@ -48,7 +48,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "translate3DProperties",
                 "spriteSheet":  true,
                 "action":       "Translate3DTool",
-                "toolTip":      "3D Translate Object Tool",
+                "toolTip":      "3D Translate Object Tool (G)",
                 "cursor":       "auto",
                 "lastInGroup":  true,
                 "container":    false,
@@ -206,7 +206,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "panProperties",
                 "spriteSheet":  true,
                 "action":       "PanTool",
-                "toolTip":      "Pan Tool",
+                "toolTip":      "Hand Tool (H)",
                 "cursor":       "url('images/tools/hand_down.png'), default",
                 "lastInGroup":  false,
                 "container":    false,