Merge branch 'mueller/master' of https://git.ksat-stuttgart.de/source/generatore_core into mueller/master