Merge branch 'master' of transfer.hft-stuttgart.de:citydoctor/citydoctor2

1 job for master in 1 minute and 12 seconds (queued for 1 second)