Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

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

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

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

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

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

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