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'
Merge pull request #1736 from wsargent/doc-scalafunctionaltest-withbrowser

[doc] More cleanup on ScalaFunctionalTest.md