gui preparation for allow spectators flag #215
Merge remote-tracking branch 'origin/master'