Merge branch 'components' of https://github.com/mencio/ninja-internal into integration

Conflicts:
	js/io/document/html-document.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 21 insertions, 0 deletions

diff --git a/node_modules/components-data/button.json b/node_modules/components-data/button.json
new file mode 100644
index 00000000..a931afcb
--- /dev/null
+++ b/node_modules/components-data/button.json
@@ -0,0 +1,21 @@
+{
+    "component": "button",
+
+    "module": "montage/ui/button.reel",
+
+    "name": "Button",
+
+    "properties": [
+
+        {
+            "name": "label",
+            "type": "string",
+            "default": "Button"
+        },
+        {
+            "name": "enabled",
+            "type": "boolean",
+            "default": "true"
+        }
+    ]
+}
\ No newline at end of file