Suggest using Scala class in ScalaTemplates.md
Merge pull request #2400 from arielscarpinelli/master

Copying interesting configuration options from ScalaDatabase.md.
fix problem with headers getting first 2 bytes dropped on some http client such as MS.net http client
Add filter method to promise
Remove use of upper-bounded wildcard types in Promise.sequence
Merge pull request #2412 from pvlugter/promise-filter

Add Promise.filter
Fix onHandlerNotFound not receiving requests modified by upstream filters
Merge pull request #2413 from pvlugter/promise-sequence

Fix Promise.sequence
Merge pull request #2403 from mkiedys/doc

Suggest using Scala class in ScalaTemplates.md
Merge pull request #2276 from jkyamog/master

First 2 bytes of http headers getting dropped on some http client
Merge pull request #2231 from bbarkley/master

Fix onHandlerNotFound not receiving requests modified by upstream filter...
Anorm cleanup, scaladoc and specs
Merge pull request #2422 from cchantep/anorm-cleanup

Anorm cleanup, scaladoc and specs
Increase timeout used by ning ws spec to fix flapping builds
Adding support for play.editor like play1
Merge pull request #2387 from jroper/enumerator-channel-end

Docs and tests for Channel.end behaviour
Merge pull request #2176 from nraychaudhuri/intellij_friendly_error

Intellij friendly error message
Derive test.timeout from system property. overload methods #2299
Merge pull request #2414 from sschwell/master

Make the timeout value for java testing configurable #2299
JSON.Reads / Writes for java.util.UUID

Basic implementation only uses UUID.fromString and can accept invalid UUIDs.
Optionally rejects incorrect uuids which are still accepted by UUID.fromString