Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local

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

2 files changed, 2 insertions, 1 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index b54d6ce0..5287ce28 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -823,4 +823,4 @@ var Layer = exports.Layer = Montage.create(Component, {
     }
         /* End: Logging routines */
 
-});
\ No newline at end of file
+});
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index be5aace4..a1e320c4 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -718,6 +718,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                     this._LayerUndoObject = thingToPush;
                     this._LayerUndoIndex = thingToPush.layerData.layerID;
                     this._LayerUndoStatus = true;
+
             }
 
         }