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/controllers/objects-controller.js b/js/controllers/objects-controller.js
index 0462df98..32eecf20 100644
--- a/js/controllers/objects-controller.js
+++ b/js/controllers/objects-controller.js
@@ -73,11 +73,11 @@ var objectsController = exports.ObjectsController = Montage.create(Montage, {
             }
         }
     },
-    
+
     /* --------------------------
           Binding Methods
     ----------------------------- */
-    
+
     addBinding : {
         value: function(bindingArgs) {
             if(!bindingArgs.sourceObject || !bindingArgs.sourceObjectPropertyPath || !bindingArgs) { return; }
@@ -122,7 +122,7 @@ var objectsController = exports.ObjectsController = Montage.create(Montage, {
 
         }
     },
-    
+
     getObjectBindings : {
         value: function(object) {
             var descriptors = object._bindingDescriptors,