Merge branch 'master' into brushtool

Conflicts:
	js/controllers/elements/shapes-controller.js

1 files changed, 28 insertions, 0 deletions

diff --git a/node_modules/components-data/map.json b/node_modules/components-data/map.json
new file mode 100644
index 00000000..655d222d
--- /dev/null
+++ b/node_modules/components-data/map.json
@@ -0,0 +1,28 @@
+{
+    "component": "map",
+
+    "module": "montage/ui/map.reel",
+
+    "name": "Map",
+
+    "properties": [
+        {
+            "name": "category",
+            "type": "select",
+            "default": "restaurant",
+            "possibleValues": ["restaurant", "hospital", "cafe", "museum"]
+        },
+        {
+            "name": "center",
+            "type": "string",
+            "default": ""
+        }
+
+    ],
+
+    "defaultStyles":  {
+        "width": "280px",
+        "height": "280px"
+    }
+
+}
\ No newline at end of file