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

53 files changed, 2983 insertions, 4 deletions

diff --git a/node_modules/montage/examples/feed-reader/images/07-map-marker.png b/node_modules/montage/examples/feed-reader/images/07-map-marker.png
new file mode 100644
index 00000000..a5d99d69
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/07-map-marker.png
diff --git a/node_modules/montage/examples/feed-reader/images/10-medical.png b/node_modules/montage/examples/feed-reader/images/10-medical.png
new file mode 100644
index 00000000..ab78c783
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/10-medical.png
diff --git a/node_modules/montage/examples/feed-reader/images/100-coffee.png b/node_modules/montage/examples/feed-reader/images/100-coffee.png
new file mode 100644
index 00000000..4e9c517a
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/100-coffee.png
diff --git a/node_modules/montage/examples/feed-reader/images/107-widescreen.png b/node_modules/montage/examples/feed-reader/images/107-widescreen.png
new file mode 100644
index 00000000..2e5f1ba7
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/107-widescreen.png
diff --git a/node_modules/montage/examples/feed-reader/images/125-food.png b/node_modules/montage/examples/feed-reader/images/125-food.png
new file mode 100644
index 00000000..81afd74a
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/125-food.png
diff --git a/node_modules/montage/examples/feed-reader/images/142-wine-bottle.png b/node_modules/montage/examples/feed-reader/images/142-wine-bottle.png
new file mode 100644
index 00000000..a7df9e97
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/142-wine-bottle.png
diff --git a/node_modules/montage/examples/feed-reader/images/34-coffee.png b/node_modules/montage/examples/feed-reader/images/34-coffee.png
new file mode 100644
index 00000000..4c4bedad
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/34-coffee.png
diff --git a/node_modules/montage/examples/feed-reader/images/35-shopping.png b/node_modules/montage/examples/feed-reader/images/35-shopping.png
new file mode 100644
index 00000000..03689f99
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/35-shopping.png
diff --git a/node_modules/montage/examples/feed-reader/images/38-airplane.png b/node_modules/montage/examples/feed-reader/images/38-airplane.png
new file mode 100644
index 00000000..dfcbbc78
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/38-airplane.png
diff --git a/node_modules/montage/examples/feed-reader/images/41-picture-frame.png b/node_modules/montage/examples/feed-reader/images/41-picture-frame.png
new file mode 100644
index 00000000..6deee997
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/41-picture-frame.png
diff --git a/node_modules/montage/examples/feed-reader/images/47-fuel.png b/node_modules/montage/examples/feed-reader/images/47-fuel.png
new file mode 100644
index 00000000..617d7640
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/47-fuel.png
diff --git a/node_modules/montage/examples/feed-reader/images/48-fork-and-knife.png b/node_modules/montage/examples/feed-reader/images/48-fork-and-knife.png
new file mode 100644
index 00000000..06d91088
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/48-fork-and-knife.png
diff --git a/node_modules/montage/examples/feed-reader/images/80-shopping-cart.png b/node_modules/montage/examples/feed-reader/images/80-shopping-cart.png
new file mode 100644
index 00000000..51a5f86f
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/80-shopping-cart.png
diff --git a/node_modules/montage/examples/feed-reader/images/87-wine-glass.png b/node_modules/montage/examples/feed-reader/images/87-wine-glass.png
new file mode 100644
index 00000000..b4d34474
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/87-wine-glass.png
diff --git a/node_modules/montage/examples/feed-reader/images/88-beer-mug.png b/node_modules/montage/examples/feed-reader/images/88-beer-mug.png
new file mode 100644
index 00000000..b0fdd99a
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/images/88-beer-mug.png
diff --git a/node_modules/montage/examples/feed-reader/index.html b/node_modules/montage/examples/feed-reader/index.html
new file mode 100644
index 00000000..3b5529b9
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/index.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<!-- <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> -->
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Montage Feed Reader</title>
+    
+    <script src="../../montage.js" data-package="."></script>
+
+    <script type="text/montage-serialization">
+        {
+            "owner": {
+                "module": "montage/ui/loader.reel",
+                "name": "Loader"
+            }
+        }
+    </script>
+
+    <style type="text/css">
+    
+        html, body {
+          background-color: #eee;
+          font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+          font-size: 13px;
+          font-weight: normal;
+          line-height: 18px;
+          color: #404040;
+          
+        }
+
+        #montage-bootstrapper {
+            display: none;
+            color: red;
+        }
+
+        .montage-bootstrapping #montage-bootstrapper {
+            display: block;
+        }
+
+        #montage-loader {
+            color: green;
+            display: none;
+        }
+
+        .montage-loading #montage-loader {
+            display: block;
+        }
+
+        .main {
+            display: block;
+        }
+
+        .montage-loaded .main {
+            display: block;
+        }
+
+    </style>
+
+</head>
+<body>
+
+    <p>
+        <center>
+            <img src="montage-logo.png" />
+        </center>
+    </p>
+
+    <div id="montage-bootstrapper">
+        <p>This is the bootstrapper content which will now be shown for at least 1500ms.</p>
+    </div>
+    <div id="montage-loader">
+        <p>This is the loader content which will now be shown for at least 2000ms.</p>
+    </div>
+
+
+</body>
+</html>
diff --git a/node_modules/montage/examples/feed-reader/main.reel/main.html b/node_modules/montage/examples/feed-reader/main.reel/main.html
new file mode 100644
index 00000000..1313219f
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/main.reel/main.html
@@ -0,0 +1,274 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />