Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/properties.reel/properties.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 29 insertions, 13 deletions

diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json
index a2e96aa3..5617234f 100644
--- a/node_modules/descriptor.json
+++ b/node_modules/descriptor.json
@@ -7,7 +7,7 @@
             "children": [
                 {"name": "bin"},
                 {"name": "core",
-                    "children": [{"name": "converter"}, {"name": "event"}, {"name": "geometry"}, {"name": "shim"}]
+                    "children": [{"name": "converter"}, {"name": "event"}, {"name": "extras"},{"name": "geometry"}, {"name": "selector"},{"name": "shim"}]
                 },
                 {"name": "data",
                     "children": [{"name": "ldapaccess"}, {"name": "nosqlaccess"}, {"name": "restaccess"}, {"name": "sqlaccess"}]
@@ -18,13 +18,12 @@
                     "children": [
                         {"name": "anchor.reel"},
                         {"name": "autocomplete",
-                            "children": [{"name": "autocomplete.reel"}, {"name": "results-list.reel"}]},
+                            "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"}]},
                         {"name": "button.reel"},
                         {"name": "checkbox.reel"},
                         {"name": "component-group.reel"},
-                        {"name": "component-placeholder.reel"},
                         {"name": "composer"},
                         {"name": "condition.reel"},
                         {"name": "controller"},
@@ -56,6 +55,8 @@
                         {"name": "textfield.reel"},
                         {"name": "toggle-button.reel"},
                         {"name": "toggle-switch.reel"},
+                        {"name": "token-field",
+                                    "children": [{"name": "token-field.reel"}, {"name": "token.reel"}]},
                         {"name": "video-player.reel",
                                     "children": [{"name": "images"}]}
                     ]
@@ -83,7 +84,8 @@
         ],
         "files": [
                 "montage/core/bitfield.js",
-                "montage/core/converter/bytes-converter.js",
+        "montage/core/change-notification.js",
+        "montage/core/converter/bytes-converter.js",
                 "montage/core/converter/converter.js",
                 "montage/core/converter/currency-converter.js",
                 "montage/core/converter/date-converter.js",
@@ -98,7 +100,11 @@
                 "montage/core/event/action-event-listener.js",
                 "montage/core/event/binding.js",
                 "montage/core/event/event-manager.js",
+        "montage/core/event/key-manager.js",
                 "montage/core/event/mutable-event.js",
+        "montage/core/extras/array.js",
+        "montage/core/extras/object.js",
+        "montage/core/extras/string.js",
                 "montage/core/exception.js",
                 "montage/core/gate.js",
                 "montage/core/geometry/cubic-bezier.js",
@@ -106,14 +112,22 @@
                 "montage/core/jshint.js",
                 "montage/core/logger.js",
                 "montage/core/next-tick.js",
+        "montage/core/promise-connection.js",
+        "montage/core/promise-queue.js",
                 "montage/core/promise.js",
+        "montage/core/selector/abstract-language.js",
+        "montage/core/selector/abstract-selector.js",
+        "montage/core/selector/abstract-semantics.js",
+        "montage/core/selector/language.js",
+        "montage/core/selector/parser.js",
+        "montage/core/selector/property-language.js",
+        "montage/core/selector/semantics.js",
+        "montage/core/selector.js",
                 "montage/core/serializer.js",
                 "montage/core/shim/array.js",
-                "montage/core/shim/immediate.js",
-                "montage/core/shim/string.js",
+                "montage/core/shim/object.js",
                 "montage/core/shim/structures.js",
                 "montage/core/shim/weak-map.js",
-                "montage/core/shim.js",
                 "montage/core/state-chart.js",
                 "montage/core/undo-manager.js",
                 "montage/core/url.js",
@@ -158,6 +172,7 @@
         "montage/ui/autocomplete/autocomplete.reel/autocomplete.html",
         "montage/ui/autocomplete/autocomplete.reel/autocomplete.js",
         "montage/ui/autocomplete/autocomplete.reel/loading.gif",
+        "montage/ui/autocomplete/result-item.reel/result-item.js",
         "montage/ui/autocomplete/results-list.reel/results-list.css",
         "montage/ui/autocomplete/results-list.reel/results-list.html",
         "montage/ui/autocomplete/results-list.reel/results-list.js",
@@ -195,9 +210,9 @@
                 "montage/ui/check-input.js",
                 "montage/ui/checkbox.reel/checkbox.js",
                 "montage/ui/component-group.reel/component-group.js",
-                "montage/ui/component-placeholder.reel/component-placeholder.js",
                 "montage/ui/component.js",
                 "montage/ui/composer/composer.js",
+        "montage/ui/composer/key-composer.js",
                 "montage/ui/composer/press-composer.js",
                 "montage/ui/composer/swipe-composer.js",
                 "montage/ui/composer/translate-composer.js",
@@ -212,11 +227,6 @@
         "montage/ui/dynamic-element.reel/dynamic-element.js",
                 "montage/ui/editable-text.js",
         "montage/ui/flow-bezier-spline.js",
-                "montage/ui/flow-path-cubic.js",
-                "montage/ui/flow-path-lerp.js",
-                "montage/ui/flow-path-linear.js",
-                "montage/ui/flow-path-sigmoid.js",
-                "montage/ui/flow-path.js",
                 "montage/ui/flow.reel/flow.html",
                 "montage/ui/flow.reel/flow.js",
                 "montage/ui/image.reel/image.js",
@@ -277,6 +287,12 @@
                 "montage/ui/toggle-switch.reel/toggle-switch.css",
                 "montage/ui/toggle-switch.reel/toggle-switch.html",
                 "montage/ui/toggle-switch.reel/toggle-switch.js",
+                "montage/ui/token-field/token-field.reel/token-field.css",
+                "montage/ui/token-field/token-field.reel/token-field.html",
+                "montage/ui/token-field/token-field.reel/token-field.js",
+                "montage/ui/token-field/token.reel/token.css",
+                "montage/ui/token-field/token.reel/token.html",
+                "montage/ui/token-field/token.reel/token.js",
                 "montage/ui/video-player.reel/images/fullscreen-enter.png",
                 "montage/ui/video-player.reel/images/fullscreen-exit.png",
                 "montage/ui/video-player.reel/images/pause.png",