Merge branch 'master' of transfer.hft-stuttgart.de:sven.schneider/citydemonstrator

3 jobs for master in 19 seconds (queued for 11 seconds)