hardcore fix
removed the need for tournament id
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/master' into development