Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/tools/SelectionTool.js

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

1 files changed, 3 insertions, 5 deletions

diff --git a/js/controllers/presets-controller.js b/js/controllers/presets-controller.js
index 7152ba93..0467f73c 100644
--- a/js/controllers/presets-controller.js
+++ b/js/controllers/presets-controller.js
@@ -59,16 +59,14 @@ exports.PresetsController = Montage.create(Component, {
             }, this);
 
             selection.forEach(function(element) {
-                var el = element._element;
-
                 if(useTransition) {
-                    this.addTransition(el);
+                    this.addTransition(element);
                 }
 
-                el.classList.add(selectorBase);
+                element.classList.add(selectorBase);
 
                 //// Keep track of elements with presets and don't add duplicates
-                this.setCachedPreset(el, presetData.id, rules);
+                this.setCachedPreset(element, presetData.id, rules);
 
             }, this);