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>

69 files changed, 7653 insertions, 3724 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",