Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

3 files changed, 18 insertions, 1 deletions

diff --git a/js/components/layout/tools-list.reel/tools-list.css b/js/components/layout/tools-list.reel/tools-list.css
index c58397e2..c58397e2 100644..100755
--- a/js/components/layout/tools-list.reel/tools-list.css
+++ b/js/components/layout/tools-list.reel/tools-list.css
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index e12fd59b..2c5617e5 100644..100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -25,6 +25,21 @@
                 }
             },
 
+            "groupLine": {
+                "module": "montage/ui/condition.reel",
+                "name": "Condition",
+                "properties": {
+                    "element": {"#": "groupLine"}
+                },
+                "bindings": {
+                    "condition": {
+                        "boundObject": {"@": "repetition1"},
+                        "boundObjectPropertyPath": "objectAtCurrentIteration.lastInGroup",
+                        "oneway": true
+                    }
+                }
+            },
+
             "repetition1": {
                 "module": "montage/ui/repetition.reel",
                 "name": "Repetition",
@@ -163,9 +178,11 @@
         <div id="toolsList" class="toolsList">
             <div id="toolscontainer" class="toolscontainer">
                 <div id="toolbutton" class="toolbutton"></div>
+                <div id="groupLine">
+                    <hr />
+                </div>
             </div>
             <!-- TODO: Remove and add as a component -->
-            <hr class="toolbar_hr" />
             <div id="colortoolbar"></div>
         </div>
 
diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js
index e26ab391..e26ab391 100644..100755
--- a/js/components/layout/tools-list.reel/tools-list.js
+++ b/js/components/layout/tools-list.reel/tools-list.js