Merge remote branch 'origin/master' into mirceakitsune/preview_images

diff --combined qcsrc/common/util.qc
index 7c5415f6b082baa2269d16f1d186cb6391c88473,5531cc483dd99c99dc1a3b44af8a9c5a6d339df2..e698a28bd8a4caff798f7767820924ffd8c9bd85
--- 1/qcsrc/common/util.qc
--- 2/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@@ -39,16 -39,6 +39,16 @@@ void wordwrap_sprint(string s, float l
  #endif
  #endif
  
 +#ifndef SVQC
 +string draw_UseSkinFor(string pic)
 +{
 +      if(substring(pic, 0, 1) == "/")
 +              return substring(pic, 1, strlen(pic)-1);
 +      else
 +              return strcat(draw_currentSkin, "/", pic);
 +}
 +#endif
 +
  string unescape(string in)
  {
        float i, len;
@@@ -205,21 -195,21 +205,21 @@@ vector colormapPaletteColor(float c, fl
  {
        switch(c)
        {
-               case  0: return '0.800000 0.800000 0.800000';
-               case  1: return '0.600000 0.400000 0.000000';
+               case  0: return '1.000000 1.000000 1.000000';
+               case  1: return '1.000000 0.333333 0.000000';
                case  2: return '0.000000 1.000000 0.501961';
                case  3: return '0.000000 1.000000 0.000000';
                case  4: return '1.000000 0.000000 0.000000';
-               case  5: return '0.000000 0.658824 1.000000';
+               case  5: return '0.000000 0.666667 1.000000';
                case  6: return '0.000000 1.000000 1.000000';
                case  7: return '0.501961 1.000000 0.000000';
                case  8: return '0.501961 0.000000 1.000000';
                case  9: return '1.000000 0.000000 1.000000';
                case 10: return '1.000000 0.000000 0.501961';
-               case 11: return '0.600000 0.600000 0.600000';
+               case 11: return '0.000000 0.000000 1.000000';
                case 12: return '1.000000 1.000000 0.000000';
-               case 13: return '0.000000 0.313725 1.000000';
-               case 14: return '1.000000 0.501961 0.000000';
+               case 13: return '0.000000 0.333333 1.000000';
+               case 14: return '1.000000 0.666667 0.000000';
                case 15:
                        if(isPants)
                                return