Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate

1 files changed, 112 insertions, 50 deletions

diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json
index 6d29cb58..b6868954 100644
--- a/node_modules/descriptor.json
+++ b/node_modules/descriptor.json
@@ -10,49 +10,60 @@
                     "children": [{"name": "converter"}, {"name": "event"}, {"name": "extras"},{"name": "geometry"}, {"name": "selector"},{"name": "shim"}]
                 },
                 {"name": "data",
-                    "children": [{"name": "ldapaccess"}, {"name": "nosqlaccess"}, {"name": "restaccess"}, {"name": "sqlaccess"}]
+                    "children": [{"name": "ldap-access"}, {"name": "nosql-access"}, {"name": "rest-access"}, {"name": "sql-access"}]
                 },
                 {"name": "require"},
-                {"name": "service"},
                 {"name": "ui",
                     "children": [
                         {"name": "anchor.reel"},
                         {"name": "autocomplete",
                             "children": [{"name": "autocomplete.reel"}, {"name": "result-item.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"}]},
+                            "children": [{"name": "button-group.reel"}, {"name": "button.reel"}, {"name": "checkbox.reel"}, {"name": "progress.reel"}, {"name": "slider.reel"}, {"name": "tabs.reel"}, {"name": "textarea.reel"}, {"name": "textfield.reel"}, {"name": "toggle.reel"}]},
                         {"name": "button.reel"},
-                        {"name": "checkbox.reel"},
                         {"name": "component-group.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": "input-checkbox.reel"},
+                        {"name": "input-date.reel"},
+                        {"name": "input-number.reel"},
+                        {"name": "input-radio.reel"},
+                        {"name": "input-range.reel"},
+                        {"name": "input-text.reel"},
                         {"name": "list.reel"},
                         {"name": "loader.reel"},
                         {"name": "loading-panel.reel"},
                         {"name": "loading.reel"},
-                        {"name": "number-input.reel"},
+                        {"name": "native",
+                            "children": [
+                                {"name": "anchor.reel"}, {"name": "button.reel"}, {"name": "image.reel"}, {"name": "input-checkbox.reel"},
+                                {"name": "input-date.reel"}, {"name": "input-number.reel"}, {"name": "input-radio.reel"}, {"name": "input-range.reel"},
+                                {"name": "input-text.reel"}, {"name": "progress.reel"}, {"name": "select.reel"}, {"name": "textarea.reel"}
+                            ]
+                        },
                         {"name": "popup",
-                                    "children": [{"name": "alert.reel"}, {"name": "confirm.reel"}, {"name": "notifier.reel"}, {"name": "popup.reel"}]
+                            "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": "rich-text-editor",
+                            "children": [{"name": "overlays",
+                                "children": [{"name": "rich-text-linkpopup.reel"}, {"name": "rich-text-resizer.reel"}]
+                            }, {"name": "rich-text-editor.reel"}]
+                        },
                         {"name": "scroll-bars.reel"},
                         {"name": "scroller.reel"},
-                        {"name": "scrollview.reel"},
-                        {"name": "select-input.reel"},
+                        {"name": "select.reel"},
                         {"name": "slot.reel"},
                         {"name": "substitution.reel"},
-                        {"name": "tabs.reel"},
+                        {"name": "text-slider.reel"},
                         {"name": "textarea.reel"},
-                        {"name": "textfield.reel"},
                         {"name": "toggle-button.reel"},
                         {"name": "toggle-switch.reel"},
                         {"name": "token-field",
@@ -133,39 +144,42 @@
                 "montage/core/url.js",
                 "montage/core/uuid.js",
                 "montage/data/blueprint.js",
-                "montage/data/context.js",
-                "montage/data/controllistener.js",
-                "montage/data/ldapaccess/ldapblueprint.js",
-                "montage/data/ldapaccess/ldapobjectid.js",
-                "montage/data/ldapaccess/ldapselectorevaluator.js",
-                "montage/data/ldapaccess/ldapstore.js",
-                "montage/data/nosqlaccess/nosqlblueprint.js",
-                "montage/data/nosqlaccess/nosqlobjectid.js",
-                "montage/data/nosqlaccess/nosqlselectorevaluator.js",
-                "montage/data/nosqlaccess/nosqlstore.js",
-                "montage/data/objectid.js",
-                "montage/data/objectproperty.js",
+                "montage/data/change-context.js",
+                "montage/data/control-listener.js",
+                "montage/data/ldap-access/ldap-mapping.js",
+                "montage/data/ldap-access/ldap-object-id.js",
+                "montage/data/ldap-access/ldap-selector-semantics.js",
+                "montage/data/ldap-access/ldap-store.js",
+        "montage/data/mapping.js",
+                "montage/data/nosql-access/nosql-mapping.js",
+                "montage/data/nosql-access/nosql-object-id.js",
+                "montage/data/nosql-access/nosql-selector-semantics.js",
+                "montage/data/nosql-access/nosql-store.js",
+                "montage/data/object-id.js",
+                "montage/data/object-property.js",
+        "montage/data/operation.js",
                 "montage/data/pledge.js",
                 "montage/data/query.js",
-                "montage/data/restaccess/restblueprint.js",
-                "montage/data/restaccess/restobjectid.js",
-                "montage/data/restaccess/restselectorevaluator.js",
-                "montage/data/restaccess/reststore.js",
+                "montage/data/rest-access/rest-mapping.js",
+                "montage/data/rest-access/rest-object-id.js",
+                "montage/data/rest-access/rest-selector-semantics.js",
+                "montage/data/rest-access/rest-store.js",
                 "montage/data/restriction.js",
-                "montage/data/selector.js",
-                "montage/data/sqlaccess/sqlblueprint.js",
-                "montage/data/sqlaccess/sqlobjectid.js",
-                "montage/data/sqlaccess/sqlselectorevaluator.js",
-                "montage/data/sqlaccess/sqlstore.js",
+                "montage/data/sql-access/sql-mapping.js",
+                "montage/data/sql-access/sql-object-id.js",
+                "montage/data/sql-access/sql-selector-semantics.js",
+                "montage/data/sql-access/sql-store.js",
+        "montage/data/store-connection-information.js",
                 "montage/data/store.js",
-                "montage/data/transactionid.js",
+                "montage/data/transaction-id.js",
                 "montage/montage.js",
                 "montage/node.js",
                 "montage/package.json",
                 "montage/require/browser.js",
                 "montage/require/node.js",
                 "montage/require/require.js",
-                "montage/service/service.js",
+        "montage/require/worker-script.js",
+        "montage/require/worker.js",
                 "montage/ui/anchor.reel/anchor.js",
                 "montage/ui/application.js",
         "montage/ui/autocomplete/autocomplete.reel/autocomplete.css",
@@ -197,6 +211,9 @@
                 "montage/ui/bluemoon/slider.reel/slider.css",
                 "montage/ui/bluemoon/slider.reel/slider.html",
                 "montage/ui/bluemoon/slider.reel/slider.js",
+        "montage/ui/bluemoon/tabs.reel/tabs.js",
+        "montage/ui/bluemoon/tabs.reel/tabs.js",
+        "montage/ui/bluemoon/tabs.reel/tabs.js",
                 "montage/ui/bluemoon/textarea.reel/textarea.css",
                 "montage/ui/bluemoon/textarea.reel/textarea.html",
                 "montage/ui/bluemoon/textarea.reel/textarea.js",
@@ -206,9 +223,10 @@
                 "montage/ui/bluemoon/toggle.reel/toggle.css",
                 "montage/ui/bluemoon/toggle.reel/toggle.html",
                 "montage/ui/bluemoon/toggle.reel/toggle.js",
-                "montage/ui/button.reel/button.js",
+                "montage/ui/button.reel/button.css",
+        "montage/ui/button.reel/button.html",
+        "montage/ui/button.reel/button.js",
                 "montage/ui/check-input.js",
-                "montage/ui/checkbox.reel/checkbox.js",
                 "montage/ui/component-group.reel/component-group.js",
                 "montage/ui/component.js",
                 "montage/ui/composer/composer.js",
@@ -220,15 +238,33 @@
                 "montage/ui/controller/array-controller.js",
                 "montage/ui/controller/media-controller.js",
                 "montage/ui/controller/object-controller.js",
-                "montage/ui/date-input.reel/date-input.js",
                 "montage/ui/dom.js",
                 "montage/ui/dynamic-text.reel/dynamic-text.js",
         "montage/ui/dynamic-element.reel/dynamic-element.js",
                 "montage/ui/editable-text.js",
         "montage/ui/flow-bezier-spline.js",
+        "montage/ui/flow.reel/flow.css",
                 "montage/ui/flow.reel/flow.html",
                 "montage/ui/flow.reel/flow.js",
                 "montage/ui/image.reel/image.js",
+        "montage/ui/input-checkbox.reel/checkbox.png",
+        "montage/ui/input-checkbox.reel/input-checkbox.css",
+        "montage/ui/input-checkbox.reel/input-checkbox.html",
+        "montage/ui/input-checkbox.reel/input-checkbox.js",