use Play 2.3 and Twirl
use Play 2.3 and Twirl (work in progress)
Merge branch '2.3'

Conflicts:
	build.sbt