Merge branch 'master' into Mario/vehicles

Merge branch 'master' into Mario/vehicles

Conflicts:
	qcsrc/client/damage.qc
	qcsrc/client/main.qc
	qcsrc/client/progs.src
	qcsrc/client/vehicles/all.qc
	qcsrc/client/vehicles/all.qh
	qcsrc/common/monsters/sv_monsters.qc
	qcsrc/common/vehicles/sv_vehicles.qh
	qcsrc/server/antilag.qc
	qcsrc/server/command/cmd.qc
	qcsrc/server/g_damage.qc
	qcsrc/server/g_damage.qh
	qcsrc/server/g_hook.qc
	qcsrc/server/g_world.qc
	qcsrc/server/mutators/mutators_include.qc
	qcsrc/server/progs.src
	qcsrc/server/sv_main.qc
	qcsrc/server/t_halflife.qc
	qcsrc/server/t_teleporters.qc
	qcsrc/server/vehicles/bumblebee.qc
	qcsrc/server/vehicles/bumblebee.qh
	qcsrc/server/vehicles/racer.qc
	qcsrc/server/vehicles/raptor.qc
	qcsrc/server/vehicles/spiderbot.qc
	qcsrc/server/vehicles/vehicle.qc