Merge branch 'database' of github.com:vexxhost/staffeln into database