Merge remote-tracking branch 'upstream/master' into doc-scalafunctionaltest-withbrowser

Conflicts:
	documentation/manual/scalaGuide/main/tests/code/FunctionalTemplateSpec.scala
Merge remote-tracking branch 'upstream/master' into doc-scalafunctionaltest-withbrowser

Conflicts:
	documentation/manual/scalaGuide/main/tests/code/FunctionalTemplateSpec.scala
Merge branch 'doc-scalafunctionaltest-withbrowser' of github.com:wsargent/Play20 into doc-scalafunctionaltest-withbrowser
Change 'for your' into 'for you'
Merge pull request #1735 from richdougherty/scala-upgrade-leak-fix

Upgrade to Scala 2.10.3-RC3 and check iteratee memory leak is fixed
Update email validation regex
Fix WS timeout configuration

Before this commit, any tentative to configure a timeout results in a
runtime exception `Configuration error[/../conf/application.conf:
31: ws.timeout has type STRING rather than OBJECT]`.

Because WS was trying to read `ws.timeout` as a duration value:
`val wsTimeout = playConfig.flatMap(_.getMilliseconds("ws.timeout"))`
Then was treating it as an object:
`playConfig.flatMap(_.getMilliseconds("ws.timeout.connection"))`

As a result, as soon as `ws.timeout` was set, be it a value or an
object, WS was unusable.

This commit removes the `ws.timeout` shortcut and only forces the user
to use `ws.timeout.connection`, `ws.timeout.idle` and
`ws.timeout.request`. `ws.timeout` is no more treatead as a value.
Merge pull request #1738 from gmethvin/email

Update email validation regex
Updated contributor guidelines
Add checks to ensure that a null string always fails validation on nonEmpty, minLength, maxLength and pattern constraints.
Add requires() to parameters on text, minLength, maxLength and pattern to ensure that parameters are valid and non-null.
Add specs for above.
Merge pull request #1743 from wsargent/1742-fix-npe-in-form-fill

Check for nulls in string validation
Merge pull request #1736 from wsargent/doc-scalafunctionaltest-withbrowser

[doc] More cleanup on ScalaFunctionalTest.md
fixed Java guide for Akka - Play 2.2.0 now uses Akka 2.2.0
fixed Scala guide for Akka - Play 2.2.0 now uses Akka 2.2.0
Merge pull request #1719 from rmmeans/master

Updating documentation for ThreadPools for Akka 2.2
Add validate method for BodyParser
Correct ScalaDoc related to Enumerators: Issue #1747
Replace all fromCallback to generateM
update Java actions composition documentation to match 2.2 changes
Merge pull request #1751 from armsargis/fix-scala-doc-enumerator

Fix scala doc related to Enumerator, Issue #1747