fix db
fixed the tournament bug
Merge branch 'dev'