Merge branch 'master' into z411/bai-server

diff --cc balance-xonotic.cfg
Simple merge

diff --cc balance-xpm.cfg
Simple merge

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

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

diff --cc qcsrc/common/weapons/weapon/electro.qc
Simple merge