Merge branch 'master' into z411/bai-server

diff --cc qcsrc/client/main.qc
Simple merge

diff --cc qcsrc/client/main.qh
Simple merge

diff --cc qcsrc/client/view.qc
Simple merge

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

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

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

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

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

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