update characters
Merge branch 'master' into develop-animation