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>

12 files changed, 4138 insertions, 3977 deletions

diff --git a/js/helper-classes/3D/GLMatrix/gl-matrix.js b/js/helper-classes/3D/GLMatrix/gl-matrix.js
index 811ed5cd..9a60b4db 100755
--- a/js/helper-classes/3D/GLMatrix/gl-matrix.js
+++ b/js/helper-classes/3D/GLMatrix/gl-matrix.js
@@ -1,4 +1,4 @@
-/* 
+/*
  * gl-matrix.js - High performance matrix and vector operations for WebGL
  * Version 1.0.0
  */
@@ -1047,7 +1047,7 @@ glmat4.scale = function (mat, vec, dest) {
  * Params:
  * mat - mat4 to rotate
  * angle - angle (in radians) to rotate
- * axis - vec3 representing the axis to rotate around 
+ * axis - vec3 representing the axis to rotate around
  * dest - Optional, mat4 receiving operation result. If not specified result is written to mat
  *
  * Returns:
@@ -1472,7 +1472,7 @@ glmat4.str = function (mat) {
 };
 
 /*
- * quat4 - Quaternions 
+ * quat4 - Quaternions
  */
 
 /*
@@ -1522,8 +1522,8 @@ quat4.set = function (quat, dest) {
 /*
  * quat4.calculateW
  * Calculates the W component of a quat4 from the X, Y, and Z components.
- * Assumes that quaternion is 1 unit in length. 
- * Any existing W component will be ignored. 
+ * Assumes that quaternion is 1 unit in length.
+ * Any existing W component will be ignored.
  *
  * Params:
  * quat - quat4 to calculate W component of
diff --git a/js/helper-classes/3D/LinePlaneIntersectRec.js b/js/helper-classes/3D/LinePlaneIntersectRec.js
index 71ee81f4..103d20cd 100755
--- a/js/helper-classes/3D/LinePlaneIntersectRec.js
+++ b/js/helper-classes/3D/LinePlaneIntersectRec.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
@@ -60,17 +61,17 @@ var LinePlaneIntersectRec = exports.LinePlaneIntersectRec = Object.create(Object
     getElementPlanes: { value: function()        {  return this._elementPlanes;  } },
     setElementPlanes: { value: function(p)       {  this._elementPlanes = p;     } },
 
-        getT: { value: function()               {  return this._t;                              } },
-        setT: { value: function(t)              {  this._t = t;                                 } },
+    getT: { value: function()       {  return this._t;              } },
+    setT: { value: function(t)      {  this._t = t;                 } },
 
-        setDeltaVis: { value: function(d)       {  this._deltaVis = d;          } },
-        getDeltaVis: { value: function()        {  return this._deltaVis;       } },
+    setDeltaVis: { value: function(d)       {  this._deltaVis = d;          } },
+    getDeltaVis: { value: function()        {  return this._deltaVis;       } },
 
-        setNext: { value: function(n)           {  this._next = n;                              } },
-        getNext: { value: function()            {  return this._next;                   } },
+    setNext: { value: function(n)       {  this._next = n;              } },
+    getNext: { value: function()        {  return this._next;           } },
 
-        getPrev: { value: function()            {  return this._prev;                   } },
-        setPrev: { value: function(p)           {  this._prev = p;                              } }
+    getPrev: { value: function()        {  return this._prev;           } },
+    setPrev: { value: function(p)       {  this._prev = p;              } }
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
diff --git a/js/helper-classes/3D/Rectangle.js b/js/helper-classes/3D/Rectangle.js
index 1922bd91..094316a9 100755
--- a/js/helper-classes/3D/Rectangle.js
+++ b/js/helper-classes/3D/Rectangle.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
@@ -67,7 +68,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, {
     getHeight: { value: function()        {  return this.m_height;                    } },
     setHeight: { value: function(h)       {  this.m_height = h;                       } },
 
-        geomType: { value: function()           {  return this.GEOM_TYPE_RECTANGLE;                     } },
+    geomType: { value: function()       {  return this.GEOM_TYPE_RECTANGLE;         } },
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
@@ -84,7 +85,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, {
         }
     },
 
-        dup: {
+    dup: {
         value: function()
         {
             var rtnRec = Object.create(Rectangle, {});
@@ -122,7 +123,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, {
         }
     },
 
-        setToBounds: {
+    setToBounds: {
         value: function( bounds )
         {
             var pt = bounds[0];
@@ -166,7 +167,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, {
         }
     },
 
-        getQuadrant: {
+    getQuadrant: {