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

diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json
index c460066c..e5606655 100644
--- a/node_modules/descriptor.json
+++ b/node_modules/descriptor.json
@@ -122,6 +122,32 @@
                 "data/sqlaccess/sqlstore.js",
                 "data/store.js",
                 "data/transactionid.js",
+                "examples/feed-reader/images/07-map-marker.png",
+                "examples/feed-reader/images/10-medical.png",
+                "examples/feed-reader/images/100-coffee.png",
+                "examples/feed-reader/images/107-widescreen.png",
+                "examples/feed-reader/images/125-food.png",
+                "examples/feed-reader/images/142-wine-bottle.png",
+                "examples/feed-reader/images/34-coffee.png",
+                "examples/feed-reader/images/35-shopping.png",
+                "examples/feed-reader/images/38-airplane.png",
+                "examples/feed-reader/images/41-picture-frame.png",
+                "examples/feed-reader/images/47-fuel.png",
+                "examples/feed-reader/images/48-fork-and-knife.png",
+                "examples/feed-reader/images/80-shopping-cart.png",
+                "examples/feed-reader/images/87-wine-glass.png",
+                "examples/feed-reader/images/88-beer-mug.png",
+                "examples/feed-reader/index.html",
+                "examples/feed-reader/main.reel/main.html",
+                "examples/feed-reader/main.reel/main.js",
+                "examples/feed-reader/map-example.reel/main.css",
+                "examples/feed-reader/map-example.reel/main.html",
+                "examples/feed-reader/map-example.reel/main.js",
+                "examples/feed-reader/package.json",
+                "examples/youtube-channel-example/index.html",
+                "examples/youtube-channel-example/package.json",
+                "examples/youtube-channel-example/style.css",
+                "examples/youtube-channel-example/youtube-channel-example.js",
                 "montage.js",
                 "node.js",
                 "package.json",
@@ -169,6 +195,7 @@
                 "ui/component.js",
                 "ui/composer/composer.js",
                 "ui/composer/long-press-composer.js",
+                "ui/composer/press-composer.js",
                 "ui/composer/swipe-composer.js",
                 "ui/composer/translate-composer.js",
                 "ui/condition.reel/condition.js",
@@ -219,21 +246,19 @@
                 "ui/popup/popup.reel/popup.css",
                 "ui/popup/popup.reel/popup.html",
                 "ui/popup/popup.reel/popup.js",
-                "ui/progress.reel/progress.css",
-                "ui/progress.reel/progress.html",
                 "ui/progress.reel/progress.js",
-                "ui/progress.reel/rule.png",
-                "ui/progress.reel/scroll.png",
                 "ui/radio-button.reel/radio-button.js",
                 "ui/range-input.reel/range-input.js",
                 "ui/repetition.reel/repetition.js",
                 "ui/scroll-bars.reel/scroll-bars.html",
                 "ui/scroll-bars.reel/scroll-bars.js",
-                "ui/scroll.js",
                 "ui/scroller.reel/scroller.html",
                 "ui/scroller.reel/scroller.js",
                 "ui/scrollview.reel/scrollview.js",
                 "ui/select-input.reel/select-input.js",
+                "ui/skeleton/range-input.reel/range-input.css",
+                "ui/skeleton/range-input.reel/range-input.html",
+                "ui/skeleton/range-input.reel/range-input.js",
                 "ui/slot.reel/slot.js",
                 "ui/substitution.reel/substitution.js",
                 "ui/tabs.reel/tabs.css",