Merge branch 'refs/heads/NinjaInternal' into FileIO

Conflicts:
	index.html

1 files changed, 2 insertions, 1 deletions

diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 3b9fc1c5..6c82cf30 100755
--- 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);
         }
     },