Merge branch 'master' of https://github.com/pussinboots/unitcover

Conflicts:
	app/global/Global.scala