Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-internal into integration

Conflicts:
	js/io/system/ninjalibrary.json

1 files changed, 16 insertions, 0 deletions

diff --git a/node_modules/components-data/youtube-channel.json b/node_modules/components-data/youtube-channel.json
new file mode 100644
index 00000000..c909fd1b
--- /dev/null
+++ b/node_modules/components-data/youtube-channel.json
@@ -0,0 +1,16 @@
+{
+    "component": "youtube-channel",
+
+    "module": "montage/ui/youtube-channel.reel",
+
+    "name": "YoutubeChannel",
+
+    "properties": [
+        {
+            "name": "channel",
+            "type": "string",
+            "default": ""
+        }
+
+    ]
+}
\ No newline at end of file