update
Merge remote-tracking branch 'origin/master'
add display tournament list
Merge remote-tracking branch 'origin/master'