Merge branch 'master' into Mario/monsters

diff --cc commands.cfg
Simple merge

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/progs.src
Simple merge

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

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

diff --cc qcsrc/menu/progs.src
index 97e17ff3c0860e6bdb0eb83c4982b6e6f1c0eb38,4900b9d96bb52db193c8aaf82771634c94279755..86cb9621c7e31d2082e45dc01bf579cfd226d757
--- 1/qcsrc/menu/progs.src
--- 2/qcsrc/menu/progs.src
+++ b/qcsrc/menu/progs.src
@@@ -53,8 -52,5 +53,6 @@@ xonotic/util.q
  ../common/mapinfo.qc
  ../common/items.qc
  ../common/urllib.qc
 +../common/monsters/monsters.qc
  
  ../warpzonelib/mathlib.qc
- 
- ../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail

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

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

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

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

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

diff --cc qcsrc/server/progs.src
Simple merge