Merge branch 'master' into TimePath/combined_updates

Conflicts:
	qcsrc/common/notifications.qh

diff --cc defaultXonotic.cfg
Simple merge

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

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

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

diff --cc qcsrc/menu/menu.qc
Simple merge

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

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

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

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

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

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