Fixed scaladoc for WebSocket.tryAcceptWithActor
Merge pull request #3179 from FabienPennequin/scaladoc-websocket

Fix scaladoc for WebSocket.tryAcceptWithActor
Added documentation about the SBT assembly plugin
Revamped documentation due to #2915 and #2898
Ensured WatchService watches directory recursively

* Also fixed MatchError on FreeBSD
New intellij documentation
Merge pull request #3193 from benmccann/idea-23x

New intellij documentation
Upgrade SBT native packager to 0.7.2 to get recent bug fixes
Merge pull request #3194 from benmccann/sbt-native-packager-072-23x

Upgrade SBT native packager to 0.7.2 to get recent bug fixes
Support for advanced Netty options

Fixes #2747
Get the latest bug fixes from sbt-native-packager with 0.7.3
Merge pull request #3200 from benmccann/package-23x-073

Get the latest bug fixes from sbt-native-packager with 0.7.3
Allow sending files with any status
Merge pull request #3222 from gmethvin/status-sendfile-2.3.x

Allow sending files with any status (2.3)
Default message for error.date message key missing
Changed play-scala-intro Scala version to 2.10.4

The DB framework sorm is only working with Scala 2.10.4. Therefor the Scala version in the build.sbt is explicitly set to 2.10.4.

Signed-off-by: Markus Jura <markus.jura@gmail.com>
Add support for sbt-web 1.1.0
Upgrade to SBT native packager 0.7.4 so that we can remove workaround for old version of slf4j being pulled in. The workaround was itself causing problems by putting multiple versions of slf4j on the classpath
Merge pull request #3227 from pvlugter/update-sbt-web-2.3.x

Add support for sbt-web 1.1
Merge pull request #3226 from benmccann/paackager074-23x

Upgrade to SBT native packager 0.7.4