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

2 jobs for master in 15 seconds (queued for 3 seconds)