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, 0 insertions, 25 deletions

diff --git a/user-document-templates/montage-application-cloud/appdelegate.js b/user-document-templates/montage-application-cloud/appdelegate.js
index 64ce6f59..3c21b46e 100755
--- a/user-document-templates/montage-application-cloud/appdelegate.js
+++ b/user-document-templates/montage-application-cloud/appdelegate.js
@@ -7,31 +7,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component;
 
-var Button = require("montage/ui/button.reel").Button,
-    Checkbox = require("montage/ui/checkbox.reel").Checkbox,
-    Condition = require("montage/ui/condition.reel").Condition,
-    DynamicText = require("montage/ui/dynamic-text.reel").DynamicText,
-
-    FlowController = require("montage/ui/flow-controller.reel").FlowController,
-
-    HotText = require("montage/ui/hottext.reel").HotText,
-    HotTextUnit = require("montage/ui/hottextunit.reel").HotTextUnit,
-
-    ImageContainer = require("montage/ui/photo-editor.reel").PhotoEditor,
-    Progress = require("montage/ui/progress.reel").Progress,
-
-    Repetition = require("montage/ui/repetition.reel").Repetition,
-    Scrollview = require("montage/ui/scrollview.reel").Scrollview,
-    Slider  = require("montage/ui/slider.reel").Slider,
-    Slot = require("montage/ui/slot.reel").Slot,
-    Substitution = require("montage/ui/substitution.reel").Substitution,
-
-    TextArea = require("montage/ui/textarea.reel").TextArea,
-    Textfield = require("montage/ui/textfield.reel").Textfield,
-
-    Toggle = require("montage/ui/toggle.reel").Toggle,
-    ToggleButton = require("montage/ui/button.reel").ToggleButton;
-
 exports.MyAppDelegate = Montage.create(Component, {
     templateDidLoad: {
                 value: function(){