yahoo/mojito — pull request #655 by drewfish (2012-10-22 20:37:39+00:00)
Title: merge develop into develop-perf

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