Merge branch 'refs/heads/NINJA-master' into TimelineUber

Conflicts:
	js/panels/Timeline/DragDrop.js
	js/panels/Timeline/Keyframe.reel/Keyframe.js
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
	js/panels/Timeline/Span.reel/Span.js
	js/panels/Timeline/Style.reel/Style.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
	js/panels/Timeline/Track.reel/Track.html
	js/panels/Timeline/Track.reel/Track.js
	js/panels/Timeline/Track.reel/css/Track.css
	js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
	js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
	js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
	js/panels/Timeline/Tween.reel/Tween.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 383 insertions, 382 deletions

diff --git a/js/models/color-model.js b/js/models/color-model.js
index cc41b59e..2c22081c 100755
--- a/js/models/color-model.js
+++ b/js/models/color-model.js
@@ -1,24 +1,25 @@
 /* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 All Rights Reserved.
-BSD License.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-  - Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  - Neither the name of Motorola Mobility nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -30,426 +31,426 @@ 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;
 ////////////////////////////////////////////////////////////////////////
 //
 exports.ColorModel = Montage.create(Component, {
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
     //
-        hasTemplate: {
-                enumerable: false,
-        value: false
-        },
-        ////////////////////////////////////////////////////////////////////
+    hasTemplate: {
+        enumerable: false,
+        value: false
+    },
+    ////////////////////////////////////////////////////////////////////
     //HSV Value of current color selected
     _gradient: {
-        enumerable: false,
-        value: null
+        enumerable: false,
+        value: null
     },
     ////////////////////////////////////////////////////////////////////
     //HSV Value of current color selected
     gradient: {
-        enumerable: true,
+        enumerable: true,
         get: function() {
             return this._gradient;
         },
         set: function(value) {
-                this._gradient = value;
-                //Updating color selected (converting to all modes)
-                this.updateColorSelected('gradient', value);
+            this._gradient = value;
+            //Updating color selected (converting to all modes)
+            this.updateColorSelected('gradient', value);
         }
     },
     ////////////////////////////////////////////////////////////////////
     //HSV Value of current color selected
     _hsv: {
-        enumerable: false,
-        value: null
+        enumerable: false,
+        value: null
     },
     ////////////////////////////////////////////////////////////////////
     //HSV Value of current color selected
     hsv: {
-        enumerable: true,
+        enumerable: true,
         get: function() {
             return this._hsv;
         },
         set: function(value) {
-                this._hsv = value;
-                //Updating color selected (converting to all modes)
-                this.updateColorSelected('hsv', value);
+            this._hsv = value;
+            //Updating color selected (converting to all modes)
+            this.updateColorSelected('hsv', value);
         }
     },
     ////////////////////////////////////////////////////////////////////
     //RGB Value of current color selected
     _rgb: {
-        enumerable: false,
-        value: null
+        enumerable: false,
+        value: null
     },
     ////////////////////////////////////////////////////////////////////
     //RGB Value of current color selected
     rgb: {
-        enumerable: true,
+        enumerable: true,
         get: function() {
             return this._rgb;
         },
         set: function(value) {
-                this._rgb = value;
-                //Updating color selected (converting to all modes)
-                this.updateColorSelected('rgb', value);
+            this._rgb = value;
+            //Updating color selected (converting to all modes)
+            this.updateColorSelected('rgb', value);
         }
     },
     ////////////////////////////////////////////////////////////////////
     //HSL Value of current color selected
     _hsl: {
-        enumerable: false,
-        value: null
+        enumerable: false,
+        value: null
     },
     ////////////////////////////////////////////////////////////////////
     //HSL Value of current color selected
     hsl: {
-        enumerable: true,
+        enumerable: true,
         get: function() {
             return this._hsl;
         },
         set: function(value) {
-                this._hsl = value;
-                //Updating color selected (converting to all modes)
-                this.updateColorSelected('hsl', value);
+            this._hsl = value;
+            //Updating color selected (converting to all modes)
+            this.updateColorSelected('hsl', value);
         }
     },
     ////////////////////////////////////////////////////////////////////
     //HEX Value of current color selected
     _hex: {
-        numerable: false,
-        value: null
+        numerable: false,
+        value: null
     },
     ////////////////////////////////////////////////////////////////////
     //HEX Value of current color selected
     hex: {
-        enumerable: true,
+        enumerable: true,
         get: function() {
             return this._hex;
         },
         set: function(value) {
-                this._hex = value;
+            this._hex = value;
             //Updating color selected (converting to all modes)
-                this.updateColorSelected('hex', value);
+            this.updateColorSelected('hex', value);
         }
     },
     ////////////////////////////////////////////////////////////////////
     //ALPHA Value of current color selected
     _alpha: {
-        enumerable: false,
-        value: {value: 1, type: 'change', wasSetByCode: true}
+        enumerable: false,
+        value: {value: 1, type: 'change', wasSetByCode: true}
     },
     ////////////////////////////////////////////////////////////////////
     //ALPHA Value of current color selected
     alpha: {
-        enumerable: true,
+        enumerable: true,
         get: function() {
             return this._alpha;
         },
         set: function(value) {
-                value.value = Math.ceil(value.value*100)/100;
+            value.value = Math.ceil(value