Merge branch 'master' of http://git.xonotic.org/xonotic/xonstat into approved
Adding colors for yellow/pink teams; make all team colors consistent (HSV value = X/100/30)
Merge branch 'master' of http://git.xonotic.org/xonotic/xonstat into approved