updating documentation to properly reflect the akka 2.2 migration per: http://doc.akka.io/docs/akka/2.2-M1/project/migration-guide-2.1.x-2.2.x.html
Make the WithBrowser text block an actual working spec.
Make all the ScalaFunctionalTest.md code snippets start with "scalafunctionaltest", other cleanup.
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'
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