Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/controllers/selection-controller.js
	js/helper-classes/RDGE/src/tools/rdge-compiled.js
	js/helper-classes/backup-delete/GLBrushStroke.js
	js/helper-classes/backup-delete/GLCircle.js
	js/helper-classes/backup-delete/GLGeomObj.js
	js/helper-classes/backup-delete/GLRectangle.js
	js/helper-classes/backup-delete/GLSubpath.js
	js/helper-classes/backup-delete/GLWorld.js
	js/helper-classes/backup-delete/Materials/BumpMetalMaterial.js
	js/helper-classes/backup-delete/Materials/DeformMaterial.js
	js/helper-classes/backup-delete/Materials/FlatMaterial.js
	js/helper-classes/backup-delete/Materials/FlyMaterial.js
	js/helper-classes/backup-delete/Materials/JuliaMaterial.js
	js/helper-classes/backup-delete/Materials/KeleidoscopeMaterial.js
	js/helper-classes/backup-delete/Materials/LinearGradientMaterial.js
	js/helper-classes/backup-delete/Materials/MandelMaterial.js
	js/helper-classes/backup-delete/Materials/PlasmaMaterial.js
	js/helper-classes/backup-delete/Materials/PulseMaterial.js
	js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js
	js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js
	js/helper-classes/backup-delete/Materials/ReliefTunnelMaterial.js
	js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js
	js/helper-classes/backup-delete/Materials/StarMaterial.js
	js/helper-classes/backup-delete/Materials/TaperMaterial.js
	js/helper-classes/backup-delete/Materials/TunnelMaterial.js
	js/helper-classes/backup-delete/Materials/TwistMaterial.js
	js/helper-classes/backup-delete/Materials/TwistVertMaterial.js
	js/helper-classes/backup-delete/Materials/UberMaterial.js
	js/helper-classes/backup-delete/Materials/WaterMaterial.js
	js/helper-classes/backup-delete/Materials/ZInvertMaterial.js
	js/lib/drawing/world.js
	js/preloader/Preloader.js
	js/stage/layout.js

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

1 files changed, 0 insertions, 30 deletions

diff --git a/js/helper-classes/backup-delete/GLLight.js b/js/helper-classes/backup-delete/GLLight.js
deleted file mode 100755
index 2bd5f77e..00000000
--- a/js/helper-classes/backup-delete/GLLight.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/* <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> */
-
-///////////////////////////////////////////////////////////////////////
-// Class GLMaterial
-//      GL representation of a material.
-///////////////////////////////////////////////////////////////////////
-function GLLight()
-{
-    ///////////////////////////////////////////////////////////////////////
-    // Instance variables
-    ///////////////////////////////////////////////////////////////////////
-        this._type = 0;
-        this._color = [0.1, 0.1, 0.1, 1];
-
-    ///////////////////////////////////////////////////////////////////////
-    // Property Accessors
-    ///////////////////////////////////////////////////////////////////////
-
-    
-    ///////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////
-
-}
-
-