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/data/tools-data.js b/js/data/tools-data.js
index 73bcd7fd..5619fe60 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -74,7 +74,7 @@ exports.ToolsData = Montage.create(Montage, {
         value: 13
     },
 
-    // NOTE: additions or removal of any tools, or any changes in the order of these entries requires updating the constant index properties above. 
+    // NOTE: additions or removal of any tools, or any changes in the order of these entries requires updating the constant index properties above.
     //       Code in the keyboard mediator and ninja.js accesses the array below through the index constants above
     defaultToolsData: {
         value: [
@@ -301,5 +301,5 @@ exports.ToolsData = Montage.create(Montage, {
     selectedToolInstance : {
         value: null
     }
-    
+
 });