Merge branch 'master' into terencehill/bot_waypoints

diff --cc qcsrc/server/bot/api.qh
Simple merge

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

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

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

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

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

diff --cc qcsrc/server/command/sv_cmd.qc
Simple merge

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