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

Conflicts:
	defaultXonotic.cfg

diff --cc defaultXonotic.cfg
index 62a8686cd08f4ddaf968b0f9a929a6fa6ec6f171,52c14b2be90d9f41000144d0ad6a9060b27e3e35..94b6cc6324edc5d4560257f0e1ddce2efeb9ef98
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -1231,8 -1136,7 +1140,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
- alias warp "sv_cmd warp $*"
  
  alias singleplayer_start "g_campaign_index 0; set scmenu_campaign_goto 0"
  alias singleplayer_continue "set scmenu_campaign_goto -1"