Merge branch 'pentool' into brushtool

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

1 files changed, 5 insertions, 0 deletions

diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
index 50a1d61d..0bb79873 100644..100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
@@ -21,6 +21,11 @@
                     "boundObject": {"@": "repetition1"},
                     "boundObjectPropertyPath": "objectAtCurrentIteration",
                     "oneway": true
+                },
+                "selectedUri": {
+                    "boundObject": {"@": "owner"},
+                    "boundObjectPropertyPath": "selected",
+                    "oneway": true
                 }
             }
         },