Merge branch 'master' into terencehill/quickmenu

diff --cc defaultXonotic.cfg
Simple merge

diff --cc keybinds.txt
Simple merge

diff --cc qcsrc/menu/classes.c
Simple merge

diff --cc qcsrc/menu/xonotic/mainwindow.c
Simple merge