Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO

Conflicts:
	js/io/document/document-controller.js
	js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
	js/io/ui/save-as-dialog.reel/save-as-dialog.js

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

1 files changed, 1 insertions, 1 deletions

diff --git a/node_modules/montage/core/url.js b/node_modules/montage/core/url.js
index 3f529e35..24e55934 100755
--- a/node_modules/montage/core/url.js
+++ b/node_modules/montage/core/url.js
@@ -11,7 +11,7 @@
     if (typeof bootstrap !== "undefined") {
         bootstrap("core/url", definition);
     } else {
-        bootstrap(require, exports);
+        definition(require, exports);
     }
 })(function (require, exports) {