Add comments to the config file
Remane 'token' route to 'player_token'
Merge from master