merging
Merge branch 'dev' of https://github.com/Philebrkr/game_contest_server_jterm into dev

Conflicts:
	app/models/match.rb
Merge branch 'dev' of https://github.com/Philebrkr/game_contest_server_jterm into dev
Merge branch 'dev' of https://github.com/Philebrkr/game_contest_server_jterm into dev
fixed missing tournaments in contest