upgrading play framework to 2.3.7 and better naming
Merge branch 'master' into releases

Conflicts:
	build.sbt
v2.3.7.1