Merge remote-tracking branch 'mint-arena/master'

Conflicts:
	code/cgame/cg_effects.c
	code/cgame/cg_event.c
	code/game/bg_misc.c
	code/game/bg_misc.h
	code/game/g_combat.c
	code/game/g_local.h
	code/game/g_main.c