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

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

1 files changed, 3 insertions, 3 deletions

diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.js b/js/components/tools-properties/oval-properties.reel/oval-properties.js
index dabe646f..195f5f97 100755
--- a/js/components/tools-properties/oval-properties.reel/oval-properties.js
+++ b/js/components/tools-properties/oval-properties.reel/oval-properties.js
@@ -41,7 +41,7 @@ exports.OvalProperties = Montage.create(ToolProperties, {
         value: null,
         serializable: true
     },
-    
+
     _subPrepare: {
         value: function() {
             //this.divElement.addEventListener("click", this, false);
@@ -66,11 +66,11 @@ exports.OvalProperties = Montage.create(ToolProperties, {
     use3D: {
         get: function() { return this.base._use3D; }
     },
-    
+
     strokeSize: {
         get: function() { return this.base._strokeSize; }
     },
-    
+
     strokeStyle : {
         get: function() {
 //            return this.base._strokeStyle.options[this.base._strokeStyle.value].text;