Merge branch 'pentool' into brushtool

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

1 files changed, 51 insertions, 0 deletions

diff --git a/node_modules/components-data/checkbox.json b/node_modules/components-data/checkbox.json
new file mode 100644
index 00000000..a03ee00f
--- /dev/null
+++ b/node_modules/components-data/checkbox.json
@@ -0,0 +1,51 @@
+{
+    "component": "checkbox",
+
+    "module": "montage/ui/checkbox.reel",
+
+    "name": "Checkbox",
+
+    "properties": [
+
+        {
+            "name": "autofocus",
+            "type": "boolean",
+            "default": "false"
+        },
+        {
+            "name": "disabled",
+            "type": "boolean",
+            "default": "false"
+        },
+        {
+            "name": "checked",
+            "type": "boolean",
+            "default": "false"
+        },
+        {
+            "name": "form",
+            "type": "string",
+            "default": ""
+        },
+        {
+            "name": "name",
+            "type": "string",
+            "default": ""
+        },
+        {
+            "name": "readonly",
+            "type": "boolean",
+            "default": null
+        },
+        {
+            "name": "title",
+            "type": "string",
+            "default": ""
+        },
+        {
+            "name": "value",
+            "type": "string",
+            "default": "on"
+        }
+    ]
+}
\ No newline at end of file