Merge branch 'master' into terencehill/bot_ai

# Conflicts:
#	qcsrc/common/gamemodes/gamemode/ctf/ctf.qc

diff --cc qcsrc/common/gamemodes/gamemode/assault/assault.qc
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/ctf/ctf.qc
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/domination/domination.qc
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qc
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qc
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
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 xonotic-server.cfg
Simple merge