Merge branches 'master' and 'playerchat'
added watcher/player distinction in lobby and throughout game.