Add WithApplicationLoader specs2 scope
Added more Http Headers & fixed ETag header
Merge pull request #3601 from mkurz/httpHeaderFixes

Added more Http Headers & fixed ETag header
add Json#parse(input: InputStream)
Swap first AkkaHttpServerSpec test and increase timeout

The first test in AkkaHttpServerSpec has been failing in master. The
purpose of this change is to investigate why. Is it only the first
test that fails? Is the failure something to do with the slow CI test
box? Once we've worked out the solution, we should be able to revert
this change.
Merge pull request #3600 from xuwei-k/Json-parse-from-InputStream

add Json#parse(input: InputStream)
Merge pull request #3602 from richdougherty/akka-http-spec-probe

Swap first AkkaHttpServerSpec test and increase timeout
changed play -> activator in ProductionDist

Some examples still listed "play" as the command to execute, I changed it to activator.
Merge pull request #3464 from julienrf/feature/with-application-loader

Add WithApplicationLoader specs2 scope
Merge pull request #3605 from domdorn/patch-2

changed play -> activator in ProductionDist
Improves handling of forwarded headers. Fix #2094
Disable Akka HTTP server tests while broken; reverse previous change
Merge pull request #3612 from richdougherty/akka-http-skip-tests

Disable Akka HTTP server tests while broken; reverse previous change
Switch to compiled doc sample for flash access in templates
Add docs for accessing flash from templates in java projects
Merge pull request #3490 from martinpallmann/issue-2094

Improves handling of forwarded headers. Fix #2094
Merge pull request #3613 from pvlugter/access-flash

Update docs for accessing flash from views
Fixes #2582