Upgraded to SBT 0.13

* Actually upgraded to 0.13.1-RC2 to address
  https://github.com/sbt/sbt/issues/937
* Also had to upgrade to specs 2.3.1 to work around issue with scalaz
  pulling in Scala 2.10.1 and SBT not honouring our scala version
* Upgraded scalariform, which meant some files change formatting
* SBT runs forked tests in a different directory, changed the tests that
  failed as a result to hopefully be more resilient to working directory
  changes
* Implements #1643
* Also fixed #1710 - caching is now used for scala/javadoc compilation
quickfix for return type of the SimpleResult methods
[#2001] Fix typo in welcome.scala.html
Update JavaFunctionalTest.md

Fixes typo (your -> you)
add spec for flash cookie
[#911] Prefix imports by _root_
Added Scaldi to the list of example projects
Merge pull request #2003 from baloo/improvements/2001-welcome-typo

[#2001] Fix typo in welcome.scala.html
[#1787] Corrects apache Reverse Proxy Configuration
Upgrade of the native packager w.r.t. issue #1928
Merge pull request #1643 from jroper/1643-upgrade-013

Upgrade Play build to SBT 0.13
Merge pull request #2006 from yanns/flashSpec

add spec for flash cookie
Merge pull request #2016 from baloo/improvements/1787-Apache-RP

[#1787] Corrects apache Reverse Proxy Configuration
Merge pull request #1928 from huntc/native-pkg-update

JAVA_OPTS not honoured
Merge pull request #2010 from baloo/improvements/911-imports-utils-package

[#911] Prefix imports by _root_
Merge pull request #1996 from julienrf/fix/result-return-type

quickfix for return type of the SimpleResult methods #1996
Merge pull request #2005 from nofatclips/master

Fixes a typo in Java Functional Test docs page
Merge pull request #2013 from OlegIlyenko/master

Added Scaldi dependency injection library to the list of example projects
Update JavaEbean.md

The line getPage(1) does not return a list. Added getList(); which does.
Merge remote-tracking branch: upstream/master