Fixed tournament admin settings
Merge pull request #424 from YiboDuan/matchconflict

Fixed tournament admin settings