Teddy update
teddy update / merge
Merge branch 'master' of https://github.com/Creaserx/VergissMeinNicht
CharacterBase integration by Rolando