Fixed typo in filename.
use Promise instead of Future in java example
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)).
Improved plugins docs

Improved the plugins docs to make it clear that plugins must declare a
single argument constructor that accepts an application, and improved
the error message that is thrown when they don't.
Add method to clear language set by withLang
Merge pull request #1468 from gmethvin/lang

Add method to clear language set by withLang
Merge pull request #1464 from jroper/improved-plugins-docs

Improved plugins docs
Fixed missed specs AsResult call
Merge pull request #1431 from oliskin/patch-1

replaced folder app/views/html/... by app/views/... in "Improving the La...
Merge pull request #1418 from yanns/patch-1

use Promise instead of Future in java example
Merge pull request #1339 from tototoshi/fix-typo-in-filename

Fixed typo in filenames.
Merge remote-tracking branch 'upstream/master'
Cookie.maxAge becomes Option[Duration]