edit character
Merge branch 'character' into system