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