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

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

1 files changed, 2 insertions, 2 deletions

diff --git a/js/components/ui/input-group.reel/input-group.js b/js/components/ui/input-group.reel/input-group.js
index ba0eea43..df3a81c4 100755
--- a/js/components/ui/input-group.reel/input-group.js
+++ b/js/components/ui/input-group.reel/input-group.js
@@ -84,7 +84,7 @@ var InputGroup = exports.InputGroup = Montage.create(Component, {
             this.dispatchEvent(propEvent);
         }
     },
-            
+
     value: {
         enumerable: true,
         serializable: true,
@@ -96,7 +96,7 @@ var InputGroup = exports.InputGroup = Montage.create(Component, {
                 retObject[childControl.label] = childControl._control[childControl._prop];
             }
             return retObject;
-            
+
         }
     },