Merge branch 'master' into divVerent/crypto2

Conflicts:
	defaultXonotic.cfg
	quake.rc

diff --cc defaultXonotic.cfg
Simple merge

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

diff --cc quake.rc
index bb2ab366a176cf954a01f5cd36c7ac67dde720a8,40228b079a962d8d2a709a55bd781cb9b26ce62f..1ae46d1d4068f53d9e6362330d7c30064afd9cf1
--- 1/quake.rc
--- 2/quake.rc
+++ b/quake.rc
@@@ -7,6 -8,3 +8,4 @@@ stuffcmd
  //startdemos demos/demo1 demos/demo2 demos/demo3
  //startdemos
  //play announcer/male/welcome.ogg
- 
- exec font-nimbussansl.cfg
 +crypto_keygen 0 http://rm.endoftheinternet.org/~xonotic/keygen/?ca=0&key=