WS: Split ConnectionTimeout and RequestTimeout properties
Add Connection Idle Timeout support and documentation

Conflicts:
	documentation/manual/scalaGuide/main/ws/ScalaWS.md
Accept dashes in i18n messages' keys
Detect usage of overloaded methods in routes prior to compilation, and throw a user-friendly error message
Test-case that checks if valid routes yield generated classes.
Correctly inferring whether overloaded handler methods are declared.
Updating the example code when specifying the language explicitly. The constructor Lang(String) is undefined.
Typo: "leaved" should be "left." This is not an issue in the Scala version.
Typo shire -> sure
Updated the Scala OpenID sample to work with the Play 2.1.x api
Add constants for mimetypes.
add additionalImports for ScalaTemplate hash seed

same problem https://github.com/playframework/Play20/pull/739
specify utf-8 charset on string creation
Update Modules.md
Formatting
Comment syntax for plugins file. Fixes #1190.
fix F.Option.toArray

* old Implementation __ALWAYS THROWS ClassCastException__
* Java is not Scala. can not use [ClassTag](https://github.com/scala/scala/blob/v2.10.2/src/library/scala/collection/GenTraversableOnce.scala#L479). [java.util.Collection#toArray](http://bit.ly/ZGwS1m) return type __SHOULD NOT__ override. can not create generic array in runtime.
* It should preserve the contracts of Collection#toArray. see javadoc http://bit.ly/11vSnzE
Fix issue 1196: MultipartFormData body parser confused by semicolon in Content-Disposition header

Fix for https://github.com/playframework/Play20/issues/1196
Issue 1196: Added spec/test
Issue 1196: Fixed problem with escaped quotes in filename
Merge branch 'master' of https://github.com/marcuslinke/Play20.git

Conflicts:
	framework/src/play/src/test/scala/play/api/mvc/ContentTypesSpec.scala