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

3 jobs for master in 12 seconds (queued for 1 second)