Add constants for mimetypes.
Add missing closing parenthesis in JavaGuide4.md
Corrected a typo in example generated HTML for Twitter Bootstrap field constructor.
Bumped master version to 2.3.0-SNAPSHOT
Updated sbt-test Play versions
Migration docs for F.Promise and OrderedExecutionContext.
Merge pull request #1680 from richdougherty/oec-migration-docs

Migration docs for F.Promise and OrderedExecutionContext.
Merge pull request #1165 from npcode/add-mimetypes

Add constants for mimetypes.
Merge pull request #1660 from salaj1986/patch-1

Corrected a typo in example generated HTML for Twitter Bootstrap field c...
scala-tools repository is dead. use sonatype
vim action fixed. :p
Forward-port Netty handling tests from 2.1.x branch

* Added tests to verify Play's interactions with Netty. We can now
  do cool things like simulate failure to send a response and check
  that connections are still closed properly. Most importantly
  though, we can check that close is only called once. This is
  very difficult to test usually because Netty either ignores
  the second close or occasionally - and only when using an HTTPS
  connection - deadlocks on the second close (#1623).
Merge pull request #1270 from ruderphilipp/patch-1

Add missing closing parenthesis in JavaGuide4.md
Ensure scala-compiler.jar is included in distribution

Fixes #1681.

Also ensures jline and jansi are in the distribution.
Share code between NettyHandlingSpec and ServerBenchmark

* Refactor code in NettyHandlingSpec into NettyRunners and
  NettySpecification.
* Move ServerBenchmark into Play-Integration-Tests so that code can
  be reused.
* Rewrite ServerBenchmark to use logic from new NettyRunners class.
  The benchmark is now slightly slower than before, probably because
  a separate channel is created for each request. This was a
  necessary change as part of the refactor, but it also gives a
  more realistic test.
Merge pull request #1681 from jroper/1681-scala-compiler-dist

scala-compiler.jar not included in distribution
Merge pull request #1664 from richdougherty/netty-test

Forward-port Netty handling tests
Add section to Java docu explaining how to initialize a database
Merge pull request #1697 from sschaef/patch-1

Add section to Java docu explaining how to initialize a database
Prefix form() with Form class in JavaGuide4.md

The ZenTask tutorial does not work if only `form()` is used. Java is not able to find the method since the `Controller` class from which `Application` is inherited does not provide such a method. To fix this, add the corresponding Class (located in `play.data.*`) as a prefix to the function call.