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, 6 insertions, 6 deletions

diff --git a/node_modules/montage/core/logger.js b/node_modules/montage/core/logger.js
index 63bcabe3..ccb75b7a 100755
--- a/node_modules/montage/core/logger.js
+++ b/node_modules/montage/core/logger.js
@@ -28,8 +28,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 /**
-        @module montage/core/logger
-        @requires montage/core/core
+    @module montage/core/logger
+    @requires montage/core/core
 */
 var Montage = require("montage").Montage,
     Logger,
@@ -61,7 +61,7 @@ getFunctionName = function(montageObject) {
 };
 
 /**
-        @function
+    @function
     @param {Date} date TODO
     @returns length hours, minutes, seconds, date.getMilliseconds()
     @private
@@ -75,20 +75,20 @@ toTimeString = function(date) {
     }
 };
 /**
-        @function
+    @function
     @private
 */
 emptyLoggerFunction = function() {
 };
 /**
-        @function
+    @function
     @private
 */
 consoleLog = function() {
     console.log(arguments);
 };
 /**
-        @function
+    @function
     @private
 */
 consoleLogMontage = function() {