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

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

1 files changed, 5 insertions, 5 deletions

diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css
index 3c6b1a61..67884628 100755
--- a/js/panels/properties.reel/properties.css
+++ b/js/panels/properties.reel/properties.css
@@ -121,7 +121,7 @@ padding-right:6px;
 .propertiesPanel .fieldRow.twoCol label {
     width:74px;
     display: inline-block;
-    
+
 }
 
 .propertiesPanel .fieldRow.oneCol label {
@@ -276,10 +276,10 @@ padding-right:6px;
 }
 
 .propertiesPanel .colortoolbar .chipContainer {
-        margin-top: 2px;
-        background: url(../../../../../images/colorpanel/transparent.png) repeat;
-        width: 40px;
-        height: 20px;
+    margin-top: 2px;
+    background: url(../../../../../images/colorpanel/transparent.png) repeat;
+    width: 40px;
+    height: 20px;
 }
 
 .propertiesPanel .button:active {