Merge branch 'master' into Mario/keyhunt

Conflicts:
	qcsrc/common/constants.qh
	qcsrc/common/mapinfo.qh
	qcsrc/server/bot/havocbot/roles.qc
	qcsrc/server/mutators/gamemode_keyhunt.qc
Merge branch 'Mario/keyhunt' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into Mario/keyhunt

Conflicts:
	effects-high.cfg
	effects-low.cfg
	effects-med.cfg
	effects-normal.cfg
	effects-omg.cfg
	effects-ultimate.cfg
	effects-ultra.cfg
	qcsrc/common/stats.qh
	qcsrc/menu/xonotic/dialog_settings_effects.c
	qcsrc/server/g_damage.qc
	qcsrc/server/mutators/gamemode_keyhunt.qc
	qcsrc/server/mutators/mutator_buffs.qc
	qcsrc/server/mutators/mutators.qc
	qcsrc/server/mutators/mutators_include.qc