Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/PositionController.scala
	app/controllers/TeamController.scala
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/users/list.scala.html