Cleanup for working version.
Merge branch 'master' of github.com:SPQR-Informatik-GmbH/web