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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/js/controllers/undo-controller.js b/js/controllers/undo-controller.js
index 011e215c..3b7f7858 100755
--- a/js/controllers/undo-controller.js
+++ b/js/controllers/undo-controller.js
@@ -133,7 +133,7 @@ exports.UndoController = Montage.create( Component, {
             return !!this.redoQueue.length;
         }
     },
-    
+
 
     deserializedFromTemplate: {
         value: function(){