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, 3 insertions, 3 deletions

diff --git a/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js b/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js
index 31582153..d9ae2686 100755
--- a/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js
+++ b/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js
@@ -6,7 +6,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 var TreeControl = require("js/components/tree.reel").Tree,
         ResizerControl = require("js/panels/Resizer").Resizer,
-        nj = require("js/lib/NJUtils.js").NJUtils;
+        nj = require("js/lib/NJUtils").NJUtils;
 
 exports.ProjectPanelBase = (require("montage/core/core").Montage).create(require("montage/ui/component").Component, {
         hasTemplate: {
@@ -577,11 +577,11 @@ exports.ProjectPanelBase = (require("montage/core/core").Montage).create(require
                 arrLinkedScrollersLength = arrLinkedScrollers.length,
                                 i = 0,
                                 that = this;
-
+                        /*
                         if (this.firstTimeDraw) {
                                 this.hasActiveProject="large";
                         }
-                        
+                        */
 
 
                 if (!this.hasActiveProject) {