update javaGuide3.md - correct onApplicationStart method name to onStart

This Patch corrects the GlobalSettings method name as described:

In JavaGuide3.md - section Bootstrapping with default data:
The paragraph called out onApplicationStart() as the method name in GlobalSettings.  

However, the API for GlobalSettings defines the method as onStart().
http://www.playframework.com/documentation/api/2.1.x/java/index.html
Add note about scala version upgrade
Merge pull request #1427 from benmccann/scala-ver-doc

Thanks so much for this @benmccann
Map key and values are encoded directly instead of having the entire key value concatenation encoded. This permits special characters to be used in key and value values.

Test coverage has been provided.

In addition the delimiters used for encoding have been changed to '=' and '&' given that these are permissible characters to appear as cookie values according to RFC 6265: http://www.rfc-editor.org/rfc/rfc6265.txt
Merge pull request #1426 from huntc/cookie-baker-refactoring

Cookie encoding issues
redirect methods should return SimpleResult so that cast is not necessary to use in Actions
Merge pull request #1429 from benmccann/simpleresult

redirect methods should return SimpleResult so that cast is not necessary to use in Actions
More tests on cookie encoding/decoding to reduce paranoia
Merge branch 'master' of git://github.com/playframework/playframework
Describe new way of setting root project in Play 2.2 migration guide
Merge pull request #1392 from richardbroersma/patch-2

update javaGuide3.md - correct onApplicationStart method name to onStart
Merge pull request #1435 from benmccann/root-project-docs2

Describe new way of setting root project in Play 2.2 migration guide
Aggregated the play-repository project with the root project such that it will be cleaned when play overall is cleaned. Accordingly the package script is now simplified by just doing a clean.

Checked the compile task to ensure that there's little impact to aggregating the repository project.
Merge pull request #1438 from huntc/clean-packaging

Remove additional 8MB of play from 2.2 archive
Fixed the tests

* Fixed the specs 2 issue where failures were silent
* Fixed ordering issues with Flash tests
* Moved some integration style tests into the integration project
* Fixed failing tests that weren't reporting before
Merge pull request #1445 from jroper/fix-tests

Fixed the tests
Serve Play documentation from a JAR file

This means Play can be distributed without needing to unzip
files onto the filesystem. This will make it easier for Activator
to interact with Play.

* Made new project, play-docs, which includes code for serving
  documentation along with the documentation content.
* The play-docs project takes responsibility for generating the
  api-docs. This happens before every package operation, which
  makes things a bit slow for publishing. That will need to be
  sped up somehow.
* The plugin's run task now runs the documentation application
  in a separate classpath to the user's code.
Merge pull request #1444 from richdougherty/doc-jar2

Serve Play documentation from a JAR file
Adding hooks for play run lifecycle

So we can track things inside activator, or other play-plugin additions.

* Deprecate old PlayOn* settings
* Create a new PlayRunHooks trait to listen to lifecycle events
* Add PlayRunHooksTask, that is retreived when play-run is called
Abstract out the 'user interaction' in the run task

* Fix bug with JLine2 upgrade where Ctrl-D isn't recognized
* Add PlayInteraction trait that describes how play blocks for input
* Wire in the default interaction mode as Console/Terminal