bugfix
Merge branch 'app' of github.com:pakohan/de.htwg.seapal.play into app