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, 5 insertions, 5 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