Fixed some namings
Merge branch 'teamproject' of https://github.com/woehrl01/htwg.seapal.lwbsjm into teamproject

Conflicts:
	app/de/htwg/seapal/web/views/content/trip_info.scala.html