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>

4 files changed, 8 insertions, 8 deletions

diff --git a/js/clipboard/internal-ops/component-clipboard-agent.js b/js/clipboard/internal-ops/component-clipboard-agent.js
index 3dc41532..31b53474 100644
--- a/js/clipboard/internal-ops/component-clipboard-agent.js
+++ b/js/clipboard/internal-ops/component-clipboard-agent.js
@@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE.
 ////////////////////////////////////////////////////////////////////////
 //
 
-var Montage =                   require("montage/core/core").Montage,
-    Component =         require("montage/ui/component").Component;
+var Montage =               require("montage/core/core").Montage,
+    Component =     require("montage/ui/component").Component;
 
 var ComponentsClipboardAgent = exports.ComponentsClipboardAgent = Montage.create(Component, {
 
diff --git a/js/clipboard/internal-ops/css-clipboard-agent.js b/js/clipboard/internal-ops/css-clipboard-agent.js
index 42dd09c9..e93077a8 100644
--- a/js/clipboard/internal-ops/css-clipboard-agent.js
+++ b/js/clipboard/internal-ops/css-clipboard-agent.js
@@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE.
 ////////////////////////////////////////////////////////////////////////
 //
 
-var Montage =                   require("montage/core/core").Montage,
-    Component =         require("montage/ui/component").Component;
+var Montage =               require("montage/core/core").Montage,
+    Component =     require("montage/ui/component").Component;
 
 var CssClipboardAgent = exports.CssClipboardAgent = Montage.create(Component, {
 
diff --git a/js/clipboard/internal-ops/elements-clipboard-agent.js b/js/clipboard/internal-ops/elements-clipboard-agent.js
index 627267fa..4f6e8195 100644
--- a/js/clipboard/internal-ops/elements-clipboard-agent.js
+++ b/js/clipboard/internal-ops/elements-clipboard-agent.js
@@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE.
 ////////////////////////////////////////////////////////////////////////
 //
 
-var Montage =                   require("montage/core/core").Montage,
-    Component =         require("montage/ui/component").Component,
+var Montage =               require("montage/core/core").Montage,
+    Component =     require("montage/ui/component").Component,
     ClipboardUtil = require("js/clipboard/util").ClipboardUtil,
     World =         require("js/lib/drawing/world").World;
 
diff --git a/js/clipboard/internal-ops/timeline-clipboard-agent.js b/js/clipboard/internal-ops/timeline-clipboard-agent.js
index d8ef7ae9..4e5cfe30 100644
--- a/js/clipboard/internal-ops/timeline-clipboard-agent.js
+++ b/js/clipboard/internal-ops/timeline-clipboard-agent.js
@@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE.
 ////////////////////////////////////////////////////////////////////////
 //
 
-var Montage =                   require("montage/core/core").Montage,
-    Component =         require("montage/ui/component").Component;
+var Montage =               require("montage/core/core").Montage,
+    Component =     require("montage/ui/component").Component;
 
 var TimelineClipboardAgent = exports.TimelineClipboardAgent = Montage.create(Component, {