Fixed Compilererrors
Merge branch 'charakter_edit' into world_edit