Merge branch 'master' into components

Conflicts:
	node_modules/montage/ui/bluemoon/progress.reel/progress.html
	node_modules/montage/ui/image2.reel/image2.html
	node_modules/ninja-components/effect/desaturate-effect.js
	node_modules/ninja-components/effect/effect.js
	node_modules/ninja-components/effect/invert-effect.js
	node_modules/ninja-components/effect/kaliedoscope-effect.js
	node_modules/ninja-components/effect/multiply-effect.js
	node_modules/ninja-components/effect/sepia-effect.js
	node_modules/ninja-components/flow-controller.reel/flow-controller.html
	node_modules/ninja-components/flow-controller.reel/flow-controller.js
	node_modules/ninja-components/flow-offset.js
	node_modules/ninja-components/hottext.reel/hottext.css
	node_modules/ninja-components/hottext.reel/hottext.html
	node_modules/ninja-components/hottext.reel/hottext.js
	node_modules/ninja-components/hottextunit.reel/hottextunit.css
	node_modules/ninja-components/hottextunit.reel/hottextunit.html
	node_modules/ninja-components/hottextunit.reel/hottextunit.js
	node_modules/ninja-components/image2.reel/image2.html
	node_modules/ninja-components/image2.reel/image2.js
	node_modules/ninja-components/image3d.reel/image3d.html
	node_modules/ninja-components/image3d.reel/image3d.js
	node_modules/ninja-components/photo-editor.reel/photo-editor.css
	node_modules/ninja-components/photo-editor.reel/photo-editor.html
	node_modules/ninja-components/photo-editor.reel/photo-editor.js
	node_modules/ninja-components/slider-base.js
	user-document-templates/montage-application-cloud/appdelegate.js

Signed-off-by: Valerio Virgillito <valerio@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 fad60394..3c21b46e 100644
--- 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 = ("montage/ui/button.reel").Button,
-//    Checkbox = ("montage/ui/checkbox.reel").Checkbox,
-//    Condition = ("montage/ui/condition.reel").Condition,
-//    DynamicText = ("montage/ui/dynamic-text.reel").DynamicText,
-//
-//    FlowController = ("montage/ui/flow-controller.reel").FlowController,
-//
-//    HotText = ("montage/ui/hottext.reel").HotText,
-//    HotTextUnit = ("montage/ui/hottextunit.reel").HotTextUnit,
-//
-//    ImageContainer = ("montage/ui/photo-editor.reel").PhotoEditor,
-//    Progress = ("montage/ui/progress.reel").Progress,
-//
-//    Repetition = ("montage/ui/repetition.reel").Repetition,
-//    Scrollview = ("montage/ui/scrollview.reel").Scrollview,
-//    Slider  = ("montage/ui/slider.reel").Slider,
-//    Slot = ("montage/ui/slot.reel").Slot,
-//    Substitution = ("montage/ui/substitution.reel").Substitution,
-//
-//    TextArea = ("montage/ui/textarea.reel").TextArea,
-//    Textfield = ("montage/ui/textfield.reel").Textfield,
-//
-//    Toggle = ("montage/ui/toggle.reel").Toggle,
-//    ToggleButton = ("montage/ui/button.reel").ToggleButton;
-
 exports.MyAppDelegate = Montage.create(Component, {
     templateDidLoad: {
                 value: function(){