test
Merge branch 'master' of https://github.com/dan91/PlayStartApp

Conflicts:
	app/views/admin/admin.scala.html