WS: Split ConnectionTimeout and RequestTimeout properties
Add Connection Idle Timeout support and documentation

Conflicts:
	documentation/manual/scalaGuide/main/ws/ScalaWS.md
Accept dashes in i18n messages' keys
Updating the example code when specifying the language explicitly. The constructor Lang(String) is undefined.
Remove note about incrementalAssetsCompilation

Remove the note about using incrementalAssetsCompilation flag which no
longer exists.
Added license report task

The license report task dumps a markdown report to standard out to give
some indication of the state of licenses that Play projects are using.
Upgrade the less compiler to version 1.4.2
Clean up Scala dependency injection, add a test for controller injection
[doc] Update documentation README to be more accurate

The README was not accurate about the packaging of documentation and how rendering of documentation was done internally.  Added some notes to about the main SBT project and the DocumentationServer.
Don't lose echo when initialising Play project settings

"play-interaction-mode" was recently introduced as a setting for Play
projects. The setting object was initialised when a Play project is
created. Unfortunately, initialising the setting object created a
JLine ConsoleReader object which, as a side-effect, disabled terminal
echo. Instead of creating a ConsoleReader at initialisation time, we
need to delay creation of the ConsoleReader until the setting object is
actually used, so echo can be restored afterwards.
Merge pull request #1476 from richdougherty/run-echo

Fix jline lost echo issues
Merge pull request #1544 from wsargent/patch-5

[doc] Update documentation README to be more accurate
ActionBuilder docs and improvements

* Added ActionBuilder.composeAction method
* Added new authentication action builder
* Documented actions composition using ActionBuilder
* Modified play-docs so that in the documentation project it can serve
  API docs from the JAR while still serving the manual off the
  filesystem
Made Global handlers return futures

The results refactoring ended with Global handlers, such as onError,
onHandlerNotFound etc, returning SimpleResult, which meant they couldn't
be asynchronous.  This changes the type to Future[SimpleResult].

Also extracted code samples out of Java Global docs, and updated all
docs for this.
Merge pull request #1545 from jroper/global-handler-futures

Made Global handlers return futures
Multiple directory support in source generators

Routes and templates source generators previously could only generate
sources for one directory at a time.  The problem is, if there were
multiple source directories, there would only be one generated
directory, and they always scanned the generated directory in order to
delete generated files that no longer had source equivalents.  This
meant there was a race condition, because source generators run in
parallel, if a generated file was found but the header hadn't been
written, it would be deleted.

This fixes it to ensure that each source generator only needs to run
once, so projects with multple source directories (eg, the documentation
project) don't have this race condition.

Also made routes generated source handling more robust.
Added a paragraph in relation to db connection pool sizes and thread pool sizes.
Merge pull request #1538 from wsargent/1538-change-ScalaDependencyInjection-page

[doc] Make ScalaDependencyInjection have examples, proper formatting
Merge pull request #1474 from jodyfanning/master

Remove note about incrementalAssetsCompilation
add play2-sprites to modules in documentation

play2-sprites is an sbt plugin that generates sprites from images