Current player is set in the game controller now
Merge remote-tracking branch 'origin/master'