Merge branch 'pentool' into brushtool

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

1 files changed, 46 insertions, 0 deletions

diff --git a/node_modules/components-data/anchor.json b/node_modules/components-data/anchor.json
new file mode 100644
index 00000000..04faf04d
--- /dev/null
+++ b/node_modules/components-data/anchor.json
@@ -0,0 +1,46 @@
+{
+    "component": "anchor",
+
+    "module": "montage/ui/anchor.reel",
+
+    "name": "Anchor",
+
+    "properties": [
+
+        {
+            "name": "textContent",
+            "type": "string",
+            "default": ""
+        },
+        {
+            "name": "href",
+            "type": "string",
+            "default": ""
+        },
+        {
+            "name": "hreflang",
+            "type": "string",
+            "default": ""
+        },
+        {
+            "name": "media",
+            "type": "string",
+            "default": ""
+        },
+        {
+            "name": "rel",
+            "type": "string",
+            "default": ""
+        },
+        {
+            "name": "target",
+            "type": "string",
+            "default": ""
+        },
+        {
+            "name": "type",
+            "type": "string",
+            "default": ""
+        }
+    ]
+}
\ No newline at end of file