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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.js b/js/components/tools-properties/shape-properties.reel/shape-properties.js
index f812f1bf..d10d2870 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.js
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js
@@ -206,7 +206,7 @@ var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, {
                     this._fillColorCtrlContainer.style["display"] = "none";
                     this._fillColorCtrlContainer.visible = false;
                     this._fillColorCtrlIcon.style["display"] = "none";
-                    this._fillColorCtrlIcon.visible = false;                    
+                    this._fillColorCtrlIcon.visible = false;
                     this.endDivider.style["display"] = "none";
                 } else {
                     this._fillColorCtrlContainer.style["display"] = "";