Updated some tournament things.
Fixed problem with antimute.
Merge branch 'master' into ent