Fix setGenerator()
Merge branch 'tournaments-frontend' into HEAD