Merge branch 'players'
Merge branch 'thief'