Merge branch 'master' into drjaska/self-dp_sf

diff --cc balance-xdf.cfg
Simple merge

diff --cc balance-xonotic.cfg
Simple merge

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

diff --cc qcsrc/client/main.qh
Simple merge

diff --cc qcsrc/common/effects/qc/damageeffects.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/devastator.qh
Simple merge

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

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