Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

Conflicts:
	js/helper-classes/RDGE/rdge-compiled.js
	js/helper-classes/RDGE/runtime/GLRuntime.js
	js/helper-classes/RDGE/src/core/script/MeshManager.js
	js/helper-classes/RDGE/src/core/script/engine.js
	js/helper-classes/RDGE/src/core/script/fx/ssao.js
	js/helper-classes/RDGE/src/core/script/init_state.js
	js/helper-classes/RDGE/src/core/script/run_state.js
	js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
	js/helper-classes/RDGE/src/core/script/utilities.js
	js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
	js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
	js/helper-classes/RDGE/src/tools/rdge-compiled.js
	js/lib/drawing/world.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/fly-material.js
	js/lib/rdge/materials/julia-material.js
	js/lib/rdge/materials/keleidoscope-material.js
	js/lib/rdge/materials/linear-gradient-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-blur-material.js
	js/lib/rdge/materials/radial-gradient-material.js
	js/lib/rdge/materials/relief-tunnel-material.js
	js/lib/rdge/materials/square-tunnel-material.js
	js/lib/rdge/materials/star-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/tunnel-material.js
	js/lib/rdge/materials/twist-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/uber-material.js
	js/lib/rdge/materials/water-material.js
	js/lib/rdge/materials/z-invert-material.js
	js/preloader/Preloader.js

1 files changed, 36 insertions, 9 deletions

diff --git a/assets/descriptor.json b/assets/descriptor.json
index ef21b8b8..85fbc996 100644
--- a/assets/descriptor.json
+++ b/assets/descriptor.json
@@ -4,32 +4,59 @@
         "root": "/assets/",
         "directories": [{"name": "images"}, {"name": "shaders"}],
         "files": [
+                "canvas-runtime.js",
                 "rdge-compiled.js",
-                "images/black.png",
-                "images/blue.png",
                 "images/BoxB2_AO.png",
-                "images/BoxB2_DM.png",
-                "images/cubelight.png",
                 "images/grey.png",
-                "images/material_paint.png",
-                "images/metal.png",
-                "images/normalMap.png",
-                "images/random_normal.png",
                 "images/rocky-diffuse.jpg",
+                "images/BoxB2_DM.png",
+                "images/material_paint.png",
                 "images/rocky-normal.jpg",
+                "images/black.png",
+                "images/metal.png",
                 "images/rocky-spec.jpg",
+                "images/blue.png",
+                "images/normalMap.png",
                 "images/silver.png",
+                "images/cubelight.png",
+                "images/random_normal.png",
                 "images/white.png",
+        "images/paris.png",
+        "images/powderblue.png",
+        "images/raiders.png",
                 "shaders/Basic.frag.glsl",
+                "shaders/TwistVert.vert.glsl",
                 "shaders/Basic.vert.glsl",
+                "shaders/Water.frag.glsl",
+                "shaders/Deform.frag.glsl",
+                "shaders/Water2.frag.glsl",
+                "shaders/Flag.vert.glsl",
+                "shaders/ZInvert.frag.glsl",
+                "shaders/Fly.frag.glsl",
                 "shaders/linearGradient.frag.glsl",
+                "shaders/Julia.frag.glsl",
                 "shaders/linearGradient.vert.glsl",
+                "shaders/Keleidoscope.frag.glsl",
+                "shaders/plasma.frag.glsl",
+                "shaders/Mandel.frag.glsl",
+        "shaders/Paris.frag.glsl",
+                "shaders/plasma.vert.glsl",
+                "shaders/Pulse.frag.glsl",
+                "shaders/radialBlur.frag.glsl",
+                "shaders/ReliefTunnel.frag.glsl",
                 "shaders/radialGradient.frag.glsl",
+                "shaders/SquareTunnel.frag.glsl",
                 "shaders/radialGradient.vert.glsl",
+                "shaders/Star.frag.glsl",
                 "shaders/test_fshader.glsl",
+                "shaders/Taper.frag.glsl",
                 "shaders/test_fshader_full.glsl",
+                "shaders/Taper.vert.glsl",
                 "shaders/test_vshader.glsl",
+                "shaders/Tunnel.frag.glsl",
                 "shaders/ub_fshader.glsl",
-                "shaders/ub_vshader.glsl"
+                "shaders/Twist.frag.glsl",
+                "shaders/ub_vshader.glsl",
+                "shaders/TwistVert.frag.glsl"
         ]
 }
\ No newline at end of file