Fix db.queryExecuteTimeLimit doc
Update Collections.scala

Small documentation fixes for `unfoldLeft` method.
Fix typo in documentation
Fix JavaWS example to use secure defaults.
Update to asynchttpclient 1.8.14
Merge pull request #3451 from wsargent/update_asynchttpclient_1.8.14

Update to asynchttpclient 1.8.14
Missing comma in sample json.
2.3.x backport - Broke out PlayWatchService and AssetsClassLoader to be shared

These files can be used in multiple contexts.  In particular, they will
be needed by the forth-coming forked-run support needed by Activator
based on sbt-server.

[Updated] Added play.sbtplugin.run.PlayWatchService back with deprecation warnings

* Also, improved stand-alone sbt scripted test setup

Conflicts:
	framework/project/Build.scala
	framework/project/Dependencies.scala

* Fixed build after cherry-pick
Ensure AddCsrfToken action provides original context

Fixes #3471

Introduced a wrapped context, so calls to mutable objects in the context
such as the session modify the original context, not the new one.
Added support for additional settings in shared projects

* Added publish settings
Fixed publish settings for 2.3.x branch
Merge pull request #3476 from corruptmemory/wip/shared-runtime-2.3.x-backport

2.3.x backport - Broke out PlayWatchService and AssetsClassLoader to be shared
Merge pull request #3450 from wsargent/fix_insecure_ws_example

[doc] [2.3.x] Fix JavaWS example to use secure defaults.
Fixed xxe problems in Play's Java XML parser
Fixed shared run project settings

Ensured they now have all the Play common settings, including groupId,
licensing and other settings necessary to publish to maven central.
Restore Row extractor
Merge pull request #3474 from limuhob/patch-1

Missing comma in sample json.
Replace reference to "retailos" with "myapp"

Not quite sure why "retailos" was in there but it doesn't match up with the rest of the documentation.
Merge pull request #3499 from sirsavary/patch-1

Replace reference to "retailos" with "myapp"
Anorm refactoring