Merge branch 'master' into terencehill/gameover_stuff

# Conflicts:
#	notifications.cfg

diff --cc notifications.cfg
Simple merge

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

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

diff --cc qcsrc/common/notifications/all.inc
Simple merge

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

diff --cc qcsrc/server/bot/default/bot.qc
Simple merge

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

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

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