Merge remote-tracking branch 'origin/master' into TimePath/guide

diff --cc qcsrc/client/hud/crosshair.qc
Simple merge

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

diff --cc qcsrc/common/monsters/sv_monsters.qc
Simple merge

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

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

diff --cc qcsrc/common/weapons/all.qc
Simple merge

diff --cc qcsrc/common/weapons/all.qh
Simple merge

diff --cc qcsrc/common/weapons/weapon.qh
Simple merge

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

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