Merge branch 'master' into components

Conflicts:
	node_modules/montage/ui/bluemoon/progress.reel/progress.html
	node_modules/montage/ui/image2.reel/image2.html
	node_modules/ninja-components/effect/desaturate-effect.js
	node_modules/ninja-components/effect/effect.js
	node_modules/ninja-components/effect/invert-effect.js
	node_modules/ninja-components/effect/kaliedoscope-effect.js
	node_modules/ninja-components/effect/multiply-effect.js
	node_modules/ninja-components/effect/sepia-effect.js
	node_modules/ninja-components/flow-controller.reel/flow-controller.html
	node_modules/ninja-components/flow-controller.reel/flow-controller.js
	node_modules/ninja-components/flow-offset.js
	node_modules/ninja-components/hottext.reel/hottext.css
	node_modules/ninja-components/hottext.reel/hottext.html
	node_modules/ninja-components/hottext.reel/hottext.js
	node_modules/ninja-components/hottextunit.reel/hottextunit.css
	node_modules/ninja-components/hottextunit.reel/hottextunit.html
	node_modules/ninja-components/hottextunit.reel/hottextunit.js
	node_modules/ninja-components/image2.reel/image2.html
	node_modules/ninja-components/image2.reel/image2.js
	node_modules/ninja-components/image3d.reel/image3d.html
	node_modules/ninja-components/image3d.reel/image3d.js
	node_modules/ninja-components/photo-editor.reel/photo-editor.css
	node_modules/ninja-components/photo-editor.reel/photo-editor.html
	node_modules/ninja-components/photo-editor.reel/photo-editor.js
	node_modules/ninja-components/slider-base.js
	user-document-templates/montage-application-cloud/appdelegate.js

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

1 files changed, 10 insertions, 16 deletions

diff --git a/node_modules/montage/ui/flow-path-linear.js b/node_modules/montage/ui/flow-path-linear.js
index fa23d10b..b95ddb92 100644
--- a/node_modules/montage/ui/flow-path-linear.js
+++ b/node_modules/montage/ui/flow-path-linear.js
@@ -1,18 +1,12 @@
-/* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
-
 var Montage = require("montage").Montage;
-    
+
 var FlowPathLinear = exports.FlowPathLinear = Montage.create(Montage, {
-        
+
     _variable: {
         enumerable: false,
         value: "time"
     },
-    
+
     variable: {
         get: function () {
             return this._variable;
@@ -29,12 +23,12 @@ var FlowPathLinear = exports.FlowPathLinear = Montage.create(Montage, {
             this._updatePath();
         }
     },
-    
+
     _origin: {
         enumerable: false,
         value: 0
     },
-    
+
     origin: {
         get: function () {
             return this._origin;
@@ -49,7 +43,7 @@ var FlowPathLinear = exports.FlowPathLinear = Montage.create(Montage, {
         enumerable: false,
         value: 1
     },
-    
+
     multiplier: {
         get: function () {
             return this._multiplier;
@@ -59,12 +53,12 @@ var FlowPathLinear = exports.FlowPathLinear = Montage.create(Montage, {
             this._updatePath();
         }
     },
-    
+
     _path: {
         enumerable: false,
         value: "0"
     },
-    
+
     path: {
         get: function () {
             return this._path;
@@ -73,11 +67,11 @@ var FlowPathLinear = exports.FlowPathLinear = Montage.create(Montage, {
             this._path = value;
         }
     },
-    
+
     _updatePath: {
         enumerable: false,
         value: function () {
             this.path = "slide."+this._variable+"*("+this._multiplier+")-("+this._origin+")";
         }
     }
-});
\ No newline at end of file
+});