Merge branch 'refs/heads/NINJAmaster' into TimelineUber

22 files changed, 337 insertions, 302 deletions

diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json
index 39da73f3..5e8ca527 100644
--- a/node_modules/components-data/feed-reader.json
+++ b/node_modules/components-data/feed-reader.json
@@ -1,7 +1,7 @@
 {
     "component": "feedreader",
 
-    "module": "montage/ui/feed-reader/feed-reader.reel",
+    "module": "montage-google/feed-reader/feed-reader.reel",
 
     "name": "FeedReader",
 
diff --git a/node_modules/components-data/map.json b/node_modules/components-data/map.json
index 655d222d..e80fa510 100644
--- a/node_modules/components-data/map.json
+++ b/node_modules/components-data/map.json
@@ -1,7 +1,7 @@
 {
     "component": "map",
 
-    "module": "montage/ui/map.reel",
+    "module": "montage-google/map.reel",
 
     "name": "Map",
 
diff --git a/node_modules/components-data/picasa-carousel.json b/node_modules/components-data/picasa-carousel.json
index 2eb601c7..b0711b12 100644
--- a/node_modules/components-data/picasa-carousel.json
+++ b/node_modules/components-data/picasa-carousel.json
@@ -1,7 +1,7 @@
 {
     "component": "picasa-carousel",
 
-    "module": "montage/ui/picasa-carousel.reel",
+    "module": "montage-google/picasa-carousel.reel",
 
     "name": "PicasaCarousel",
 
diff --git a/node_modules/components-data/youtube-channel.json b/node_modules/components-data/youtube-channel.json
index c909fd1b..44180d72 100644
--- a/node_modules/components-data/youtube-channel.json
+++ b/node_modules/components-data/youtube-channel.json
@@ -1,7 +1,7 @@
 {
     "component": "youtube-channel",
 
-    "module": "montage/ui/youtube-channel.reel",
+    "module": "montage-google/youtube-channel.reel",
 
     "name": "YoutubeChannel",
 
diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json
index e5606655..a2e96aa3 100644
--- a/node_modules/descriptor.json
+++ b/node_modules/descriptor.json
@@ -1,285 +1,307 @@
 {
         "copyright": "This file contains proprietary software owned by Motorola Mobility, Inc. No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder. (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.",
         "version": "0.0.0.0",
-        "root": "/node_modules/montage/",
-        "directories": [{"name": "core",
-                        "children": [{"name": "converter"}, {"name": "event"}, {"name": "geometry"}, {"name": "shim"}]
-        },
-        
-        {"name": "data",
-                        "children": [{"name": "ldapaccess"}, {"name": "nosqlaccess"}, {"name": "restaccess"}, {"name": "sqlaccess"}]
-        },
-        
-        {"name": "require"},
-        
-        {"name": "service"},
-        
-        {"name": "ui",
-                "children": [   {"name": "anchor.reel"},
-                                                {"name": "bluemoon",
-                                                                        "children": [{"name": "button-group.reel"}, {"name": "button.reel"}, {"name": "checkbox.reel"}, {"name": "progress.reel"}, {"name": "slider.reel"}, {"name": "textarea.reel"}, {"name": "textfield.reel"}, {"name": "toggle.reel"}]
-                                                },
-                                                {"name": "button.reel"},
-                                                {"name": "checkbox.reel"},
-                                                {"name": "component-group.reel"},
-                                                {"name": "component-placeholder.reel"},
-                                                {"name": "composer"},
-                                                {"name": "condition.reel"},
-                                                {"name": "controller"},
-                                                {"name": "date-input.reel"},
-                                                {"name": "dynamic-text.reel"},
-                                                {"name": "flow.reel"},
-                                                {"name": "image.reel"},
-                                                {"name": "list.reel"},
-                                                {"name": "loader.reel"},
-                                                {"name": "loading-panel.reel"},
-                                                {"name": "loading.reel"},
-                                                {"name": "number-input.reel"},
-                                                {"name": "popup",
-                                                                        "children": [{"name": "alert.reel"}, {"name": "confirm.reel"}, {"name": "notifier.reel"}, {"name": "popup.reel"}]
-                                                },
-                                                {"name": "progress.reel"},
-                                                {"name": "radio-button.reel"},
-                                                {"name": "range-input.reel"},
-                                                {"name": "repetition.reel"},
-                                                {"name": "scroll-bars.reel"},
-                                                {"name": "scroller.reel"},
-                                                {"name": "scrollview.reel"},
-                                                {"name": "select-input.reel"},
-                                                {"name": "slot.reel"},
-                                                {"name": "substitution.reel"},
-                                                {"name": "tabs.reel"},
-                                                {"name": "textarea.reel"},
-                                                {"name": "textfield.reel"},
-                                                {"name": "toggle-button.reel"},
-                                                {"name": "toggle-switch.reel"},
-                                                {"name": "video-player.reel",
-                                                                        "children": [{"name": "images"}]
-                                                }
-                ]
-        }],
+        "root": "/node_modules/",
+        "directories": [
+        {"name": "montage",
+            "children": [
+                {"name": "bin"},
+                {"name": "core",
+                    "children": [{"name": "converter"}, {"name": "event"}, {"name": "geometry"}, {"name": "shim"}]
+                },
+                {"name": "data",
+                    "children": [{"name": "ldapaccess"}, {"name": "nosqlaccess"}, {"name": "restaccess"}, {"name": "sqlaccess"}]
+                },
+                {"name": "require"},
+                {"name": "service"},
+                {"name": "ui",
+                    "children": [
+                        {"name": "anchor.reel"},
+                        {"name": "autocomplete",
+                            "children": [{"name": "autocomplete.reel"}, {"name": "results-list.reel"}]},
+                        {"name": "bluemoon",
+                            "children": [{"name": "button-group.reel"}, {"name": "button.reel"}, {"name": "checkbox.reel"}, {"name": "progress.reel"}, {"name": "slider.reel"}, {"name": "textarea.reel"}, {"name": "textfield.reel"}, {"name": "toggle.reel"}]},
+                        {"name": "button.reel"},
+                        {"name": "checkbox.reel"},
+                        {"name": "component-group.reel"},
+                        {"name": "component-placeholder.reel"},
+                        {"name": "composer"},
+                        {"name": "condition.reel"},
+                        {"name": "controller"},
+                        {"name": "date-input.reel"},
+                        {"name": "dynamic-element.reel"},
+                        {"name": "dynamic-text.reel"},
+                        {"name": "flow.reel"},
+                        {"name": "image.reel"},
+                        {"name": "list.reel"},
+                        {"name": "loader.reel"},
+                        {"name": "loading-panel.reel"},
+                        {"name": "loading.reel"},
+                        {"name": "number-input.reel"},
+                        {"name": "popup",
+                                    "children": [{"name": "alert.reel"}, {"name": "confirm.reel"}, {"name": "notifier.reel"}, {"name": "popup.reel"}]
+                        },
+                        {"name": "progress.reel"},
+                        {"name": "radio-button.reel"},
+                        {"name": "range-input.reel"},
+                        {"name": "repetition.reel"},
+                        {"name": "scroll-bars.reel"},
+                        {"name": "scroller.reel"},
+                        {"name": "scrollview.reel"},
+                        {"name": "select-input.reel"},
+                        {"name": "slot.reel"},
+                        {"name": "substitution.reel"},
+                        {"name": "tabs.reel"},
+                        {"name": "textarea.reel"},
+                        {"name": "textfield.reel"},
+                        {"name": "toggle-button.reel"},
+                        {"name": "toggle-switch.reel"},
+                        {"name": "video-player.reel",
+                                    "children": [{"name": "images"}]}
+                    ]
+                }]
+        },
+
+        {"name": "montage-google",
+            "children": [
+                {"name": "feed-reader",
+                    "children": [
+                        {"name": "feed-entry.reel"},
+                        {"name": "feed-reader.reel"}
+                    ]
+                },
+                {"name": "map.reel"},
+                {"name": "picasa-carousel.reel",
+                    "children": [
+                        {"name": "image.reel"}
+                    ]
+                },
+                {"name": "youtube-channel.reel"},
+                {"name": "youtube-player.reel"}
+            ]
+        }
+        ],
         "files": [