Fixed scoping error in _pollPlayers. Improved readability in players.html
Resolved merge conflicts.