Merge remote branch 'origin/fruitiex/mirceakitsune_mapcoordinator'

diff --combined xonotic-credits.txt
index b29da88b8b575af29f351e16d15d7a7c95b7dcc8,6a65112a6333805857d206c958774d7b774e7eb0..ab9da492294e52898d5fdcd8c5b417fbe89496dc
--- 1/xonotic-credits.txt
--- 2/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@@ -22,6 -22,7 +22,7 @@@ morphe
  
  *Level Design
  FruitieX
+ MirceaKitsune
  
  *Music / Sound FX
  mand1nga
@@@ -56,7 -57,6 +57,7 @@@ Kristian "morfar" Johansso
  kojn
  Maik "SavageX" Merten
  MrBougo
 +Samual Lenks
  Stephan "esteel" Stahl
  Wolfgang "Blub\0" Bumiller
  
@@@ -105,7 -105,6 +106,6 @@@ MauveBi
  Mephisto
  michaelb
  Michael "Tenshihan" Quinn
- MirceaKitsune
  Munyul
  Netzwerg
  NoelCower
@@@ -118,6 -117,7 +118,6 @@@ Rick "Rat" Kelle
  Robert "ai" Kuroto
  Ronan
  Sajt
 -Samual Lenks
  Severin "sev" Meyer
  Shaggy
  Shank