Merge branch 'master' into drjaska/morosophos/server-current4

diff --cc _hud_common.cfg
Simple merge

diff --cc bal-wep-mario.cfg
Simple merge

diff --cc bal-wep-nexuiz25.cfg
Simple merge

diff --cc bal-wep-samual.cfg
Simple merge

diff --cc bal-wep-xdf.cfg
Simple merge

diff --cc bal-wep-xonotic.cfg
Simple merge

diff --cc qcsrc/client/hud/panel/scoreboard.qc
Simple merge

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

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

diff --cc qcsrc/common/mapobjects/trigger/jumppads.qh
Simple merge

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

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

diff --cc qcsrc/server/compat/quake3.qc
Simple merge

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

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

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

diff --cc xonotic-server.cfg
Simple merge