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
Accept all WebSocket subprotocols.
Make the WithBrowser text block an actual working spec.
Make all the ScalaFunctionalTest.md code snippets start with "scalafunctionaltest", other cleanup.
Upgrade to Scala 2.10.3-RC3 and check iteratee memory leak is fixed

Scala 2.10.3 inclues a fix that allows memory to be freed when chaining
Future.flatMap calls (SI-7336). Iteratees make extensive use of
Future.flatMap, so upgrading to Scala 2.10.3 allows us to avoid memory
leaks when using iteratees (#1084). Memory leaks can occur when
processing large amounts of data or when working with connections that
can remain open for a long time.
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
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
Correct ScalaDoc related to Enumerators: Issue #1747
Replace all fromCallback to generateM