minor fixes
Merge branch 'server2' of https://github.com/egetzner/appagainsthumanity into server2