Fix colors of players
Merge branch 'master' into feature-week1