[20] move players
Merge branch '20-move-players' into develop