Merge remote-tracking branch 'upstream/master'

Conflicts:
	code/game/g_main.cpp
	code/macosx/English.lproj/InfoPlist.strings
	code/qcommon/q_shared.h
	codeJK2/macosx/English.lproj/InfoPlist.strings
	codemp/cgame/cg_servercmds.c
	codemp/game/NPC_combat.c
	codemp/game/NPC_reactions.c
	codemp/game/g_active.c
	codemp/game/g_client.c
	codemp/game/g_cmds.c
	codemp/game/g_local.h
	codemp/game/g_main.c
	codemp/game/teams.h
	codemp/macosx/English.lproj/InfoPlist.strings
	codemp/ui/ui_gameinfo.c
	codemp/ui/ui_main.c