modifs
Merge branch 'next' of github.com:StarTrack/server into next

Conflicts:
	app/views/main.scala.html