54 files changed, 1315 insertions, 489 deletions

diff --git a/css/ninja.css b/css/ninja.css
index cd7a35ab..db2497c8 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -118,9 +118,9 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
 
 #sceneBar { height: 70px; background-color: #474747; }
 
-#mainContainer .rulerTop { display: none; background: gray url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; border-right: 11px solid black; }
+#mainContainer .rulerTop { display: none; background: gray url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; }
 
-.rulerLeft { display: none; background: gray url("../images/temp/ruler-left.png"); width: 16px; border-bottom: 11px solid black; }
+.rulerLeft { display: none; background: gray url("../images/temp/ruler-left.png"); width: 16px; }
 
 #stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; }
 
@@ -863,6 +863,8 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
 
 .InkBottleTool { background-image: url("../images/tools/Tool-FillColor.png"); }
 
+.bindingTool { background-image: url("../images/tools/binding.png"); }
+
 .toolsList .colortoolbar { padding-left: 1px; padding-top: 4px; }
 
 .toolsList .colortoolbar button { width: 27px; height: 27px; background: black; border: 1px solid #000; padding: 0; margin: 0px; }
@@ -987,4 +989,10 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
 
 .montage-invisible { display: none; }
 
+body .panel.ws-binding { display: none; -webkit-box-flex-group: 2; }
+
+body.ws-binding .rightPanelContent .panel { display: none; }
+
+body.ws-binding .rightPanelContent .panel.ws-binding { display: -webkit-box; }
+
 /*77*/
diff --git a/images/cursors/binding.png b/images/cursors/binding.png
new file mode 100644
index 00000000..16e84574
--- /dev/null
+++ b/images/cursors/binding.png
diff --git a/images/tools/binding.png b/images/tools/binding.png
new file mode 100644
index 00000000..33545ee1
--- /dev/null
+++ b/images/tools/binding.png
diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html
index 4aed23d9..cf3dbbf5 100755
--- a/js/components/layout/documents-tab.reel/documents-tab.html
+++ b/js/components/layout/documents-tab.reel/documents-tab.html
@@ -33,17 +33,17 @@
                     },
                     "name": {
                         "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration.name",
+                        "boundObjectPropertyPath": "objectAtCurrentIteration.model.file.name",
                         "oneway": true
                     },
                     "saveFlag": {
                         "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration.needsSave",
+                        "boundObjectPropertyPath": "objectAtCurrentIteration.model.needsSave",
                         "oneway": true
                     },
                     "active": {
                         "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration.isActive",
+                        "boundObjectPropertyPath": "objectAtCurrentIteration.model.isActive",
                         "oneway": true
                     }
                 }
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index 9aa05e5d..25aac8fb 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -112,6 +112,9 @@
             "ZoomTool1": {
                 "prototype": "js/tools/ZoomTool"
             },
+            "BindingTool1": {
+                "prototype": "js/tools/BindingTool"
+            },
 
             "disable": {
                 "prototype": "montage/ui/condition.reel",
@@ -151,6 +154,7 @@
                     "RotateStageTool3D":      {"@": "RotateStageTool3D1"},
                     "PanTool":                {"@": "PanTool1"},
                     "ZoomTool":               {"@": "ZoomTool1"},
+                    "bindingTool":            {"@": "BindingTool1"},
                     "components": [
                         {"@": "repetition1"}
                     ]
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html
index 10309ec4..9061cd12 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.html
+++ b/js/components/layout/tools-properties.reel/tools-properties.html
@@ -120,6 +120,12 @@
                     "element": {"#": "zoomProperties"}
                 }
             },
+            "bindingProperties1": {
+                "prototype": "js/components/tools-properties/binding-properties.reel",
+                "properties": {
+                    "element": {"#": "bindingProperties"}
+                }
+            },
 
             "disable": {
                 "prototype": "montage/ui/condition.reel",
@@ -155,7 +161,8 @@
                     "eraserProperties":             {"@": "eraserProperties1"},
                     "rotateStageProperties":        {"@": "rotateStageProperties1"},
                     "panProperties":                {"@": "panProperties1"},
-                    "zoomProperties":               {"@": "zoomProperties1"}
+                    "zoomProperties":               {"@": "zoomProperties1"},
+                    "bindingProperties":            {"@": "bindingProperties1"}