Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	js/document/html-document.js
	js/helper-classes/3D/snap-manager.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 20 insertions, 1 deletions

diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js
index 13ebbdbd..21d7fcee 100755
--- a/js/preloader/Preloader.js
+++ b/js/preloader/Preloader.js
@@ -64,11 +64,30 @@ exports.Preloader = Montage.create(Component, {
                 {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"},
                 {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.js"},
                 {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"},
+
                 {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"},
+                {"type":"js", "url":"js/helper-classes/RDGE/Materials/TaperMaterial.js"},
+                {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistVertMaterial.js"},
                 {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"},
-                {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"},
+                {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"},
                 {"type":"js", "url":"js/helper-classes/RDGE/Materials/LinearGradientMaterial.js"},
+                {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"},
+                                {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialBlurMaterial.js"},
+                {"type":"js", "url":"js/helper-classes/RDGE/Materials/PulseMaterial.js"},
+                {"type":"js", "url":"js/helper-classes/RDGE/Materials/TunnelMaterial.js"},
+                {"type":"js", "url":"js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js"},
+                {"type":"js", "url":"js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js"},
+                {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlyMaterial.js"},
+                {"type":"js", "url":"js/helper-classes/RDGE/Materials/WaterMaterial.js"},
+                {"type":"js", "url":"js/helper-classes/RDGE/Materials/ZInvertMaterial.js"},
+                {"type":"js", "url":"js/helper-classes/RDGE/Materials/DeformMaterial.js"},
+                {"type":"js", "url":"js/helper-classes/RDGE/Materials/StarMaterial.js"},
+                {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistMaterial.js"},
+                {"type":"js", "url":"js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js"},
+                {"type":"js", "url":"js/helper-classes/RDGE/Materials/JuliaMaterial.js"},
+                {"type":"js", "url":"js/helper-classes/RDGE/Materials/MandelMaterial.js"},
                 {"type":"js", "url":"js/helper-classes/RDGE/Materials/BumpMetalMaterial.js"},
+
                 {"type":"js", "url":"js/helper-classes/RDGE/GLWorld.js"},
                 {"type":"js", "url":"js/helper-classes/RDGE/GLGeomObj.js"},
                 {"type":"js", "url":"js/helper-classes/RDGE/GLCircle.js"},