Merge branch 'master' into Mario/use1

diff --cc qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
Simple merge

diff --cc qcsrc/common/mutators/mutator/nades/nades.qc
Simple merge

diff --cc qcsrc/common/t_items.qc
Simple merge

diff --cc qcsrc/common/triggers/trigger/jumppads.qc
Simple merge

diff --cc qcsrc/common/util.qh
Simple merge

diff --cc qcsrc/common/weapons/weapon/hagar.qc
Simple merge

diff --cc qcsrc/server/cl_client.qc
Simple merge

diff --cc qcsrc/server/miscfunctions.qh
Simple merge

diff --cc qcsrc/server/mutators/mutator/gamemode_domination.qc
Simple merge