Merge branch 'refs/heads/ninja-internal-master' into bugfix-master

Conflicts:
	js/ninja.reel/ninja.html

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 15 insertions, 0 deletions

diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 138f9f4d..8ed6433e 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -46,6 +46,9 @@ exports.ToolsData = Montage.create(Montage, {
     zoomToolIndex: {
         value: 12
     },
+    bindingToolIndex: {
+        value: 13
+    },
 
     // NOTE: additions or removal of any tools, or any changes in the order of these entries requires updating the constant index properties above. 
     //       Code in the keyboard mediator and ninja.js accesses the array below through the index constants above
@@ -243,6 +246,18 @@ exports.ToolsData = Montage.create(Montage, {
                 "container":    false,
                 "subtools":     [],
                 "selected":     false
+            },
+            {
+                "id":           "bindingTool",
+                "properties":   "bindingProperties",
+                "spriteSheet":  true,
+                "action":       "bindingTool",
+                "toolTip":      "Binding (B)",
+                "cursor":       "url('images/cursors/binding.png'),default",
+                "lastInGroup":  true,
+                "container":    false,
+                "subtools":     [],
+                "selected":     false
             }
         ]
     },