Merge branch 'refs/heads/ninja-internal' into SnapManagerFixes

Conflicts:
	js/helper-classes/RDGE/Materials/FlatMaterial.js

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 90015f5a..469d38f7 100644
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -14,7 +14,7 @@ exports.Ninja = Montage.create(Component, {
     _preload: { value: false },
 
     ninjaVersion: {
-        value: window.ninjaVersion.ninja.version
+        value: null
     },
 
     toolsData: { value: null },
@@ -34,6 +34,7 @@ exports.Ninja = Montage.create(Component, {
 
     templateDidLoad: {
         value: function() {
+            this.ninjaVersion = window.ninjaVersion.ninja.version;
             this.eventManager.addEventListener( "preloadFinish", this, false);
         }
     },