Merge branch 'master' into Mario/ons_updates

diff --cc gamemodes.cfg
Simple merge

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

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

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

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

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

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

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