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

Conflicts:
	js/panels/presets/animations-presets.reel/animations-presets.js
	js/panels/presets/style-presets.reel/style-presets.js
	js/panels/presets/transitions-presets.reel/transitions-presets.js

1 files changed, 2 insertions, 2 deletions

diff --git a/js/panels/presets/style-presets.reel/style-presets.js b/js/panels/presets/style-presets.reel/style-presets.js
index 11f41822..a742213e 100644
--- a/js/panels/presets/style-presets.reel/style-presets.js
+++ b/js/panels/presets/style-presets.reel/style-presets.js
@@ -61,7 +61,7 @@ exports.StylesLibrary = Montage.create(Component, {
             }, this);
 
 
-        }
+            }
     },
     handleDragEnd : {
         value: function(sourceObject) {
@@ -75,7 +75,7 @@ exports.StylesLibrary = Montage.create(Component, {
             console.log('1Handle should change selection');
             return false;
         }
-    }
+        }
 
 
 });