Throw traps and boni from the generator
Merge branch 'master' of https://github.com/Fannon/IA6.Medienprojekt