Updated to Play 2.3.1
Merge branch 'master' into play-2.3

Conflicts:
	project/ManagementBuild.scala
	version.sbt
Fix sbt errors
Merge pull request #4 from guardian/play-2.3

Updated to Play 2.3.1