Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts:
	js/helper-classes/3D/StageLine.js

1 files changed, 3 insertions, 3 deletions

diff --git a/js/panels/Timeline/Track.reel/Track.js b/js/panels/Timeline/Track.reel/Track.js
index e1b03525..2e761c4a 100644
--- a/js/panels/Timeline/Track.reel/Track.js
+++ b/js/panels/Timeline/Track.reel/Track.js
@@ -105,10 +105,10 @@ var Track = exports.Track = Montage.create(Component, {
 
     //TEMP
     keyFrames:{
-        serializable: true,
+        serializable: true,
         value:[]
     },
-    
+
     prepareForDraw: {
         value: function() {
             this.keyFrames = new Array();
@@ -187,7 +187,7 @@ var Track = exports.Track = Montage.create(Component, {
 
     updateKeyframePercents:{
         value:function(){
-            
+
         }
     },