Merge branch 'refs/heads/master' into binding

Conflicts:
	js/document/models/html.js
	js/document/views/design.js
	js/ninja.reel/ninja.js

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

1 files changed, 2 insertions, 2 deletions

diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index a6a03323..fb195bd3 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -107,7 +107,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "penProperties",
                 "spriteSheet":  true,
                 "action":       "PenTool",
-                "toolTip":      "Pen Tool",
+                "toolTip":      "Pen Tool (P)",
                 "cursor":       "auto",
                 "lastInGroup":  false,
                 "container":    false,
@@ -168,7 +168,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "brushProperties",
                 "spriteSheet":  true,
                 "action":       "BrushTool",
-                "toolTip":      "Brush Tool",
+                "toolTip":      "Brush Tool (B)",
                 "cursor":       "url('images/tools/brush_down.png') 9 17, default",
                 "lastInGroup":  false,
                 "container":    false,