merge
Merge branch 'master' of https://github.com/pagereborn/esports
fix trade undefined player