Update useroptions.html
Merge remote-tracking branch 'origin/tournament' into tournament
Tournaments improvements