Mention sbt version in getting started guide
upgrade to last netty version

for https://github.com/playframework/playframework/issues/3268
add note maximum number of fileds limitation for a single tupple or mapping

I guess if there is written only about 22 limitation, newbies will be confused.
* taken in @cchantep suggestion.

Conflicts:
	documentation/manual/scalaGuide/main/forms/ScalaForms.md
Add a note on AsyncAppender to logging.
Merge pull request #3301 from wsargent/patch-7

[doc] Add a note on AsyncAppender to logging page.
Fix a typo in CSRF docs
Update ScalaGlobal.scala

Fix a typo. handel -> handle
Merge pull request #3315 from itsheng/patch-1

Update ScalaGlobal.scala
Update JavaJPA.md

The version of hibernate-entitymanager is horribly out of date. Updating it to the latest.
Merge pull request #3325 from chothia/patch-1

Update JavaJPA.md
Merge pull request #3298 from hepin1989/patch-3

upgrade to last netty version
Use URI instead of URL to parse Java WS URLs

AsyncHttpClient eventually passes the url to URI.create anyway, so this
means that NingWSRequestHolder will fail in a manner consistent with
AsyncHttpClient.

The specific use case that this has been done to address is allowing
WebSocket URLs, which URI.create is fine with, but new URL throws an
exception.
Update Modules.md
Merge pull request #3356 from jexbox/patch-1

Update Modules.md
fixing comments that is slightly confusing
Document the correct package of the Lang class.
Fix example so it is clear the secure defaults should always be used.
Add update to ExampleSSLConfig.md
Merge pull request #3393 from wsargent/fix_insecure_ws_example

[doc] Fix example so it is clear the secure defaults should always be used.
Fixed documetation by removing colon from Content-Security-Policy Default Setting