bla
Merge branch 'app' of https://github.com/Harryson/de.htwg.seapal.play into app

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