more refactoring with player
Merge branch 'master' of https://github.com/tmzhuang/pvz-reloaded