Generator Bugfix
Merge branch 'kollis2'
Merge branch 'master' of git://github.com/Fannon/IA6.Medienprojekt