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/ui/loading-panel.reel/loading-panel.html b/node_modules/montage/ui/loading-panel.reel/loading-panel.html
index ccd6d9bd..27825a09 100755
--- a/node_modules/montage/ui/loading-panel.reel/loading-panel.html
+++ b/node_modules/montage/ui/loading-panel.reel/loading-panel.html
@@ -22,7 +22,7 @@
             },
 
             "loadingIndicator": {
-                "module": "montage/ui/progress.reel",
+                "module": "montage/ui/bluemoon/progress.reel",
                 "name": "Progress",
                 "properties": {
                     "element": {"#": "loadingIndicator"},