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

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

1 files changed, 6 insertions, 6 deletions

diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css
index e4ecf167..7c6e5d3a 100644
--- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css
@@ -39,8 +39,8 @@ POSSIBILITY OF SUCH DAMAGE.
     background-color:#494949;
     font-family: 'Droid Sans', sans-serif;
     border-radius: 8px;
-        box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);
-        text-shadow: 1px 1px 1px #000;
+    box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);
+    text-shadow: 1px 1px 1px #000;
 }
 
 .picker .pickerHeader{
@@ -229,13 +229,13 @@ POSSIBILITY OF SUCH DAMAGE.
 }
 
 .picker .buttons button {
-        float: left;
-        width: 100px;
-        margin-top: 3px;
+    float: left;
+    width: 100px;
+    margin-top: 3px;
 }
 
 .picker .okButton{
-        margin: 0px 22px 0px 8px; 
+    margin: 0px 22px 0px 8px;
     /*
 margin-right:25px;
     -webkit-box-align: center;