Fix some javadoc errors that were preventing the build from compiling when using JDK 1.8.
Merge branch 'sbt-link-spacing' of github.com:benmccann/playframework
Merge pull request #2585 from wsargent/fix-scaladoc-halting-18-build

Fix javadoc errors
Merge pull request #2583 from cchantep/anorm-contains

Row parser
Rename sbt-link project to build-link since there is nothing SBT-specific about it
Merge pull request #2511 from tsuyoshizawa/cutomizable-csrf-error

Add customizable CSRF error handling
Merge pull request #2580 from sarah31/FirstFix

added a small fix
Updated the way Play uses application.secret

Fixes #1775.

* Play now generates an application secret that is stable to the place
  where the application is running from in dev and test mode.
* Play will fail to load if application secret is not set or changeme in
  production.
* Created new SBT tasks for generating and updating the application
  secret.
* Wrote new docs on the application secret, how configure it, and best
  practices.
* Updated production documentation to refer to activator.
Upgraded all dependencise of Play

* Didn't upgrade to hibernate-validator 5.1.0 because it adds a number
  of extra JEE dependencies that I'm not sure we want.
* async-http-client 1.8.x changed the package of cookies, the
  Cookie constructor, and the available properties.
    - Removed version property from Play cookies because AHC doesn't
      support it anymore
    - Added expires property to Play cookies because AHC does support
      it.
    - Made the Scala API return Option for maxAge and expires, returning
      None if the server doesn't set it, or Some if the server does.
fix issue #2480: a custom SSL context can be used for HTTPS

- document how to use a SSLContextProvider
- factor default SSL context out of NettyServer
Merge pull request #2564 from jroper/dep-refresh

Upgraded all dependencise of Play
Merge pull request #2497 from yanns/issue-2480

fix issue #2480: a custom SSL context can be used for HTTPS
More explicit column conversion
Merge pull request #1775 from jroper/application-secret

sbt task for generating a new application.secret
Increase test await timeout from 5 seconds to 20 seconds

Master is currently failing due to timeouts in certain tests on our
CI box. Increasing the test timeout will hopefully allow CI builds
to work again.

At some point in the future, it would be better to make this
timeout configurable using something like system properties.
At the moment I just need a quick fix.
Merge pull request #2592 from richdougherty/increase-test-timeout

Increase test await timeout from 5 seconds to 20 seconds
Merge pull request #2587 from benmccann/build-link-rename

Rename sbt-link project to build-link since there is nothing SBT-specific about it
Merge pull request #2569 from cchantep/anorm-explicit-col-conv

More explicit column conversion
Merge pull request #2546 from jroper/getting-started

Updated getting started guide to document activator
fix OWrites implicitNotFound message