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