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
Updating the example code when specifying the language explicitly. The constructor Lang(String) is undefined.
Add constants for mimetypes.
Java version of the OAuth Twitter example in the documentation
Add missing closing parenthesis in JavaGuide4.md
added EventSource for java and sample projects
upgrade less from 1.3.3 to 1.4.1
fix content of less-1.4.1.js
Fixed typo in filename.
update javaGuide3.md - correct onApplicationStart method name to onStart

This Patch corrects the GlobalSettings method name as described:

In JavaGuide3.md - section Bootstrapping with default data:
The paragraph called out onApplicationStart() as the method name in GlobalSettings.  

However, the API for GlobalSettings defines the method as onStart().
http://www.playframework.com/documentation/api/2.1.x/java/index.html
Update build from source instructions for the current code base
use Promise instead of Future in java example
Add SimpleSql.map to modify defaultParser results
redirect methods should return SimpleResult so that cast is not necessary to use in Actions
Merge pull request #1429 from benmccann/simpleresult

redirect methods should return SimpleResult so that cast is not necessary to use in Actions
replaced folder app/views/html/... by app/views/... in "Improving the Layout"

Seems like this is a typo. The folder for projects/group.scala.html, projects/item.scala.html, and main.scala.html should be just views instead of views/html.

At least in my case the tutorial didn't work when putting, for example, the projects folder into app/views/html.
(Doing the tutorial with play! 2.1.2 (using Java 1.6.0_51 and Scala 2.10.0)).
More tests on cookie encoding/decoding to reduce paranoia
Merge branch 'master' of git://github.com/playframework/playframework