Fix variable names
Merge remote-tracking branch 'origin/master'
Add i18n, add tournament removing