create team template
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/users.scala.html
	conf/routes