Merge branch 'master' into matthiaskrgr/screenshotcmd

diff --cc commands.cfg
index 4ece57f84af588d7b827c3301621004694de5826,20f957029a3472151c0756d25eb444959906d57d..26bd3be7cd5069fe472d2020d349f868ef009659
--- 1/commands.cfg
--- 2/commands.cfg
+++ b/commands.cfg
@@@ -123,7 -123,7 +123,8 @@@ alias hud                  "qc_cmd_c
  alias localprint           "qc_cmd_cl     localprint           ${* ?}" // Create your own centerprint sent to yourself
  //alias mv_download        "qc_cmd_cl     mv_download          ${* ?}" // Retrieve mapshot picture from the server
  alias sendcvar             "qc_cmd_cl     sendcvar             ${* ?}" // Send a cvar to the server (like weaponpriority)
 +alias plainscreenshot      "menu_watermark \"\" ; cl_hidewaypoints 1 ; viewsize 120 ; settemp crosshair 0 ; screenshot ; settemp_restore crosshair ; viewsize 100 ; cl_hidewaypoints 0 ; menu_watermark"
+ alias exit                 "quit"
  
  // other aliases for local commands
  alias hud_configure "qc_cmd_cl hud configure"