Merge branch 'Tournament_fronend' into 'general_fix'

Tournament fronend

See merge request !23
1 job for general_fix in 1 minute and 3 seconds (queued for 6 seconds)