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

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

1 files changed, 11 insertions, 11 deletions

diff --git a/js/panels/CSSPanel/css-shorthand-map.js b/js/panels/CSSPanel/css-shorthand-map.js
index dc0b4a55..92abcf1b 100755
--- a/js/panels/CSSPanel/css-shorthand-map.js
+++ b/js/panels/CSSPanel/css-shorthand-map.js
@@ -38,56 +38,56 @@ exports.CSS_SHORTHAND_MAP = {
     'background-position-y' : ['background', 'background-position'],
     'background-repeat-x' : ['background', 'background-repeat'],
     'background-repeat-y' : ['background', 'background-repeat'],
-    
+
     'border-bottom' : ['border'],
     'border-bottom-color' : ['border-bottom'],
     'border-bottom-style' : ['border-bottom'],
     'border-bottom-width' : ['border-bottom'],
-    
+
     'border-left' : ['border'],
     'border-left-color' : ['border-left'],
     'border-left-style' : ['border-left'],
     'border-left-width' : ['border-left'],
-    
+
     'border-right' : ['border'],
     'border-right-color' : ['border-right'],
     'border-right-style' : ['border-right'],
     'border-right-width' : ['border-right'],
-    
+
     'border-top' : ['border'],
     'border-top-color' : ['border-top'],
     'border-top-style' : ['border-top'],
     'border-top-width' : ['border-top'],
-    
+
     'border-color' : ['border'],
     'border-style' : ['border'],
-    
+
     'border-image-outset' : ['border-image'],
     'border-image-repeat' : ['border-image'],
     'border-image-slice' : ['border-image'],
     'border-image-source' : ['border-image'],
     'border-image-width' : ['border-image'],
-    
+
     'border-bottom-left-radius' : ['border-radius'],
     'border-bottom-right-radius' : ['border-radius'],
     'border-top-left-radius' : ['border-radius'],
     'border-top-right-radius' : ['border-radius'],
-        
+
     'font-style' : ['font'],
     'font-family' : ['font'],
     'font-size' : ['font'],
     'font-variant' : ['font'],
     'font-weight' : ['font'],
-    
+
     'list-style-image' : ['list-style'],
     'list-style-position' : ['list-style'],
     'list-style-type' : ['list-style'],
-    
+
     'margin-bottom' : ['margin'],
     'margin-left' : ['margin'],
     'margin-right' : ['margin'],
     'margin-top' : ['margin'],
-    
+
     'padding-bottom' : ['padding'],
     'padding-left' : ['padding'],
     'padding-right' : ['padding'],