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