Merge remote-tracking branch 'upstream/develop' into clean-startup
Merged upstream/develop.
Merge branch 'develop' into develop-perf

Conflicts:
	examples/developer-guide/binding_events/mojits/PagerMojit/models/model.server.js
	examples/developer-guide/model_yql/mojits/flickr/models/model.server.js
	examples/developer-guide/unittest_model_controller/mojits/flickr/models/model.server.js
	examples/getting-started-guide/part2/basic_yql/mojits/Flickr/models/model.server.js
	examples/getting-started-guide/part3/intl-templates/mojits/Flickr/models/model.server.js
	lib/app/commands/start.js
	lib/index.js (most of which moved to lib/mojito.js)
Merge branch 'develop' into perf-merge-develop

Conflicts:
	docs/dev_guide/code_exs/binding_events.rst
	examples/developer-guide/binding_events/mojits/PagerMojit/controller.server.js
	examples/developer-guide/binding_events/mojits/PagerMojit/models/model.server.js
	examples/developer-guide/configure_routing/mojits/RoutingMojit/controller.server.js
	examples/developer-guide/device_assets/mojits/device/controller.server.js
	examples/developer-guide/generating_urls/mojits/GenURLMojit/controller.server.js
	examples/developer-guide/model_yql/mojits/flickr/controller.server.js
	examples/developer-guide/model_yql/mojits/flickr/models/model.server.js
	examples/developer-guide/multiple_mojits/mojits/BodyMojit/controller.server.js
	examples/developer-guide/multiple_mojits/mojits/FooterMojit/controller.server.js
	examples/developer-guide/multiple_mojits/mojits/FrameMojit/controller.server.js
	examples/developer-guide/multiple_mojits/mojits/HeaderMojit/controller.server.js
	examples/developer-guide/unittest_model_controller/mojits/flickr/controller.server.js
	examples/developer-guide/unittest_model_controller/mojits/flickr/models/model.server.js
	examples/developer-guide/using_configs/mojits/ContactUs/controller.server.js
	examples/developer-guide/using_cookies/mojits/CookieMojit/controller.server.js
	examples/developer-guide/using_parameters/mojits/QueryMojit/controller.server.js
	examples/getting-started-guide/part2/basic_yql/mojits/Flickr/controller.server.js
	examples/getting-started-guide/part2/basic_yql/mojits/Flickr/models/model.server.js
	examples/getting-started-guide/part3/intl-templates/mojits/Flickr/controller.server.js
	examples/getting-started-guide/part3/intl-templates/mojits/Flickr/models/model.server.js
	examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/controller.common.js
	examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/models/model.common.js
	examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/controller.common.js
	examples/getting-started-guide/part5/flickr-list/mojits/PagedFlickr/controller.common.js
	lib/app/archetypes/app/default/index.js
	lib/app/archetypes/app/default/server.js
	lib/app/archetypes/app/full/index.js
	lib/app/archetypes/app/full/server.js
	lib/app/archetypes/app/simple/server.js
	lib/app/middleware/mojito-handler-static.js
	lib/mojito.js
	package.json
Merge branch 'develop-perf' into merge-perf

Conflicts:
	docs/dev_guide/code_exs/adding_assets.rst
	docs/dev_guide/code_exs/app_config.rst
	docs/dev_guide/code_exs/binding_events.rst
	docs/dev_guide/code_exs/calling_yql.rst
	docs/dev_guide/code_exs/dynamic_assets.rst
	docs/dev_guide/code_exs/framed_assets.rst
	docs/dev_guide/code_exs/global_assets.rst
	docs/dev_guide/code_exs/index.rst
	docs/dev_guide/code_exs/intermojit_communication.rst
	docs/dev_guide/code_exs/overview.rst
	docs/dev_guide/code_exs/query_params.rst
	docs/dev_guide/code_exs/route_config.rst
	docs/dev_guide/code_exs/simple_logging.rst
	docs/dev_guide/code_exs/simple_view_template.rst
	docs/dev_guide/code_exs/view_engines.rst
	docs/dev_guide/code_exs/views_multiple_devices.rst
	docs/dev_guide/code_exs/yui_modules.rst
	docs/dev_guide/getting_started/index.rst
	docs/dev_guide/getting_started/mojito_getting_started_tutorial.rst
	docs/dev_guide/getting_started/quickstart.rst
	docs/dev_guide/index.rst
	docs/dev_guide/intro/index.rst
	docs/dev_guide/intro/mojito_configuring.rst
	docs/dev_guide/intro/mojito_mvc.rst
	docs/dev_guide/quickstart/index.rst
	docs/dev_guide/reference/mojito_cmdline.rst
	docs/dev_guide/topics/index.rst
	docs/dev_guide/topics/mojito_hosting_container_reqs.rst
	examples/developer-guide/binding_events/mojits/PagerMojit/controller.server.js
	examples/developer-guide/configure_routing/mojits/RoutingMojit/models/model.server.js
	examples/developer-guide/device_views/mojits/device/models/model.server.js
	examples/developer-guide/generating_urls/mojits/GenURLMojit/tests/models/model.server-tests.js
	examples/developer-guide/hello/mojits/HelloMojit/tests/models/model.server-tests.js
	examples/developer-guide/inter-mojit/mojits/ReceiverMojit/controller.server.js
	examples/developer-guide/inter-mojit/mojits/ReceiverMojit/definition.json
	examples/developer-guide/inter-mojit/mojits/ReceiverMojit/tests/controller.server-tests.js
	examples/developer-guide/model_yql/mojits/flickr/controller.server.js
	examples/developer-guide/model_yql/mojits/flickr/models/model.server.js
	examples/developer-guide/multiple_mojits/mojits/HeaderMojit/models/model.server.js
	examples/developer-guide/scroll_views/mojits/scroll/models/model.server.js
	examples/developer-guide/simple_assets/mojits/simple/models/model.server.js
	examples/developer-guide/unittest_model_controller/mojits/flickr/tests/controller.server-tests.js
	examples/developer-guide/unittest_model_controller/mojits/flickr/tests/models/model.server-tests.js
	lib/app/addons/rs/config.js
	lib/app/archetypes/app/hybrid/mojits/top_frame/definition.json
	lib/app/archetypes/app/yahoo/mojits/.placeholder
	lib/app/archetypes/app/yahoo/package.json.hb
	lib/app/autoload/store.server.js
	lib/app/commands/start.js
	lib/app/commands/test.js
	lib/management/cli.js
	lib/management/utils.js
	lib/tests/fixtures/badfiles/mojits/M/definition.json
	package.json
	tests/func/applications/frameworkapp/yaml-config/mojits/simple/defaults.json
	tests/func/applications/frameworkapp/yaml-config/mojits/simple/specs/default.json
	tests/func/common/testmojitproxybroadcaststaticlisten2.js
	tests/func/examples/developerguide/test_yuimodule.js
	tests/run.js
	tests/unit/lib/app/addons/rs/test-url.js
	tests/unit/lib/app/autoload/test-store.server.js
Merge remote-tracking branch 'isao/buildjsfix' into merge-perf

Conflicts:
	lib/app/commands/build/index.js
Merge remote-tracking branch 'upstream/develop' into fixlint
Merge pull request #840 from lzhan/mostart

mojito start output version of mojito being run
Copyright (c) 2011-2013, Yahoo! Inc.
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #916 from caridy/yaml

re-enable yaml support:
- closes #804
- appConfig can be used as part of mojito start
- comments are now supported
Merge pull request #924 from lzhan/addunittest

add more unit tests for help command
updating PR with the latest from develop after 2.5.2, solving conflits generated by the hook system.
Merge pull request #962 from lzhan/clitests

add more unit tests for cli mojito test