Merge branch 'master' into gh-pages
syncing character roster
Merge branch 'gh-pages'