Merge remote branch 'origin/master' into samual/menu_updates

diff --combined defaultXonotic.cfg
index ec47f047e59566abe8bd6413b1e19e97e2e0ffb9,f5efdc6852acdae5537255c3e6ee12f780b2c222..ad04baea3769fc29b875c0efe55e89be43346b99
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -1185,7 -1185,7 +1185,7 @@@ set quit_and_redirect ""        "set to an IP 
  set g_campaign 0
  set g_campaign_forceteam 0 "Forces the player to a given team in campaign mode, 1 = red, 2 = blue, 3 = yellow, 4 = pink"
  seta g_campaign_name "xonoticbeta"
 -set g_campaign_skill 0
 +seta g_campaign_skill -1 // -2 easy -1 medium 0 hard
  set g_campaignxonotic20_index 0
  set g_campaignxonotic25_index 1
  
@@@ -1695,7 -1695,6 +1695,6 @@@ set capturelimit 
  
  // hud: font size
  seta hud_fontsize 11
- seta scr_centersize 12
  seta hud_width 560
  
  // these entities are not referenced by anything directly, they just represent