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/popup/confirm.reel/confirm.css b/node_modules/montage/ui/popup/confirm.reel/confirm.css
index 8d326cce..959cf719 100755
--- a/node_modules/montage/ui/popup/confirm.reel/confirm.css
+++ b/node_modules/montage/ui/popup/confirm.reel/confirm.css
@@ -3,7 +3,7 @@
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
- 
+
  .montage-confirm-dialog {
      min-width: 300px;
  }