Merge branch 'pentool' into brushtool

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

1 files changed, 36 insertions, 0 deletions

diff --git a/node_modules/components-data/toggle-button.json b/node_modules/components-data/toggle-button.json
new file mode 100644
index 00000000..e85dd72a
--- /dev/null
+++ b/node_modules/components-data/toggle-button.json
@@ -0,0 +1,36 @@
+{
+    "component": "toggleButton",
+
+    "module": "montage/ui/toggle-button.reel",
+
+    "name": "ToggleButton",
+
+    "properties": [
+
+        {
+            "name": "pressed",
+            "type": "boolean",
+            "default": "false"
+        },
+        {
+            "name": "unpressedLabel",
+            "type": "string",
+            "default": ""
+        },
+        {
+            "name": "pressedLabel",
+            "type": "string",
+            "default": ""
+        },
+        {
+            "name": "pressedClass",
+            "type": "string",
+            "default": "pressed"
+        },
+        {
+            "name": "label",
+            "type": "string",
+            "default": ""
+        }
+    ]
+}
\ No newline at end of file