1.2.9: Merge branch 'master' of https://github.com/JACoders/OpenJK.git

# Conflicts:
#	code/cgame/cg_ents.cpp
#	code/client/cl_main.cpp
#	code/client/snd_music.cpp
#	code/game/g_client.cpp
#	code/game/g_public.h
#	code/game/genericparser2.h
#	code/game/wp_melee.cpp
#	code/qcommon/cm_load.cpp
#	code/qcommon/cm_local.h
#	code/qcommon/common.cpp
#	code/qcommon/sstring.h
#	code/rd-common/tr_public.h
#	code/rd-common/tr_types.h
#	code/rd-vanilla/tr_backend.cpp
#	code/rd-vanilla/tr_shade.cpp
#	code/server/sv_savegame.cpp
#	code/ui/ui_main.cpp
#	codeJK2/game/g_public.h