schaut euch den diff an -.-
Merge branch 'app' of github.com:pakohan/de.htwg.seapal.play into app

Conflicts:
	lib/Seapal Core.jar