Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal

Conflicts:
	js/components/gradientpicker.reel/gradientpicker.js
	js/components/tools-properties/text-properties.reel/text-properties.js
	js/document/views/base.js
	js/document/views/design.js
	js/helper-classes/3D/StageLine.js
	js/helper-classes/3D/draw-utils.js
	js/lib/drawing/world.js
	js/lib/geom/circle.js
	js/lib/geom/line.js
	js/lib/geom/rectangle.js
	js/lib/geom/shape-primitive.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/flag-material.js
	js/lib/rdge/materials/fly-material.js
	js/lib/rdge/materials/julia-material.js
	js/lib/rdge/materials/keleidoscope-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-gradient-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/water-material.js
	js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
	js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
	js/panels/Materials/materials-popup.reel/materials-popup.html
	js/panels/Materials/materials-popup.reel/materials-popup.js
	js/tools/LineTool.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/js/components/core/class-uuid.js b/js/components/core/class-uuid.js
index 6c5530c4..010495e7 100755
--- a/js/components/core/class-uuid.js
+++ b/js/components/core/class-uuid.js
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
  </notice> */
 
 /**
-        @module components/core/class-uuid
+    @module components/core/class-uuid
     @requires montage/core/core
 */
 /**
@@ -62,7 +62,7 @@ var Montage = require("montage/core/core").Montage,
                 id[2] = c[(r >>>= 4) & 0xf];
                 id[3] = c[(r >>>= 4) & 0xf];
                 id[4] = c[(r >>>= 4) & 0xf];
-                
+
                 return id.join('');
             }
         }