Fixed Compilererrors
Merge branch 'charakter_edit'