Resources should be on the Eclipse classpath. This makes running in Eclipse much closer to running in SBT where resources are on the classpath
add CanBuild22#apply, join, reduce, tupled
update specs2
Fix JavaWS example to use secure defaults.
Merge pull request #3564 from wsargent/fix_insecure_ws_example_master

[doc] [WS] Fix JavaWS example to use secure defaults.
Add WSResponse#bodyAsBytes method
Html.empty replaced by HtmlFormat.empty

See: https://groups.google.com/forum/#!msg/play-framework/bTvJbeR_zvU/mpom08-idCQJ and https://github.com/playframework/twirl/blob/master/api/src/main/scala/play/twirl/api/Formats.scala#L77
Anorm positional extractor on Row & implicit refactoring
refactoring build files

http://stackoverflow.com/a/24103453/605582
Merge pull request #3519 from gmethvin/body-as-bytes

WSResponse does not show contentType
Merge pull request #3568 from cchantep/anorm-3568

Anorm positional extractor on Row & implicit refactoring
Implemented HttpRequestHandler abstraction

* Pulled onRequest, routeRequest, filter etc methods out of GlobalSettings,
and put them into a HttpRequestHandler abstraction.
* Introduced HttpConfiguration abstraction to abstract out http
  configuration
* Rewrote Scala documentation on intercepting requests
* Didn't rewrite Java documentation on intercepting requests - felt a
  bit like yak shaving
Merge pull request #3566 from jmcejuela/patch-2

Html.empty replaced by HtmlFormat.empty
Merge pull request #3561 from xuwei-k/twenty-two

add CanBuild22#apply, join, reduce, tupled
Merge pull request #3550 from jroper/http-request-handler

Implemented HttpRequestHandler abstraction
Merge pull request #3008 from xuwei-k/meta-buildinfo

refactoring build files
Merge pull request #3330 from xuwei-k/update-specs2

update specs2
Removed ServerBenchmark

Given that prune now is testing performance quite well, and appears to
be able to reliably pick up and identify regressions in many places, and
also given that we we haven't run the benchmark in a long time, I've
removed the ServerBenchmark to simplify the build.

Also removed the NettyHandlerSpec, which depended on the same
NettyRunner that the ServerBenchmark depended on - all the tests in
there were covered by the other tests that made real HTTP connections to
the server, and so didn't just test that we were calling what we thought
we were supposed to be calling on Netty, but tested that we were calling
the right methods on Netty.

The reason I've deleted these is because they were getting quite
expensive to maintain - there was a custom implementation of a router,
custom implementation of play.api.Application, etc, and I was finding in
the implementation of many of the DI changes in Play, there was always
something in these benchmarks that was breaking that needed to be fixed,
because these tests weren't reusing any of the existing test
infrastructure provided by Play.
Merge pull request #3562 from jroper/remove-performance-tests

Removed ServerBenchmark
MultipartFormDataParser: Parts with colon in name

This fixes an issue, where the multipart/form-data parser lost
colons in the name of parts.

Adjusted the Testsuite.