Merge branch 'pentool' into brushtool

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

1 files changed, 27 insertions, 0 deletions

diff --git a/node_modules/components-data/image.json b/node_modules/components-data/image.json
new file mode 100644
index 00000000..d6080196
--- /dev/null
+++ b/node_modules/components-data/image.json
@@ -0,0 +1,27 @@
+{
+    "component": "imageComponent",
+
+    "module": "montage/ui/image.reel",
+
+    "name": "Image",
+
+    "properties": [
+
+        {
+            "name": "alt",
+            "type": "string",
+            "default": ""
+        },
+        {
+            "name": "src",
+            "type": "string",
+            "default": ""
+        },
+        {
+            "name": "title",
+            "type": "string",
+            "default": ""
+        }
+
+    ]
+}
\ No newline at end of file