Bugfix
Tests
Merge branch 'kollis'
Traps Prototype
Merge branch 'master' of git://github.com/Fannon/IA6.Medienprojekt