Intellij friendly error message
Docs and tests for Channel.end behaviour

* Worked out exactly how Channel.end is implemented
* Wrote tests to assert this behaviour
* Wrote docs to specify this behaviour
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
Merge pull request #2428 from divarvel/master

Add: JSON serialization / Deserialization of java.util.UUID
Specification for date column
Merge pull request #2434 from cchantep/anorm-datecol-specs

Specifications for date column
Add default to ScalaForms.md
Merge pull request #2452 from richdougherty/fix-2319-master

Add information about default values to ScalaForms.md
Issue #2395 JSON doc rewrite
Merge remote-tracking branch 'upstream/master'

Merge upstream from master project.