Fix some final bugs on character costume
Merge remote-tracking branch 'origin/master'