Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into savagex/techa...

Conflicts:
	scripts/shaderlist.txt

diff --cc scripts/shaderlist.txt
index 1c73fa2d5f2742c05c52fe6e666ef38d1fdf6ca2,73593a2de94c6b060b0fee4545b1b3450a09928e..1422b067fac4115db3d1b6ef0e460d61c8a61305
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -16,7 -16,7 +16,8 @@@ liquids_wate
  map_glowplant
  map_red-planet
  map_space-elevator
 +map_techassault
+ map_stormkeep
  model_bigfan01
  model_desertfactory
  model_tree