Merge remote-tracking branch 'remotes/origin/develop' into develop

Conflicts:
	Vocaluxe.sln
	Vocaluxe/Base/CConfig.cs

VocaluxeLib/Menu/SongMenu/CSong.cs

@@ -31,14 +31,44 @@ namespace Vocaluxe.Menu.SongMenu
     public class CCategory
     {
         public string Name = String.Empty;
-        public STexture CoverTextureSmall = new STexture(-1);
-        public STexture CoverTextureBig = new STexture(-1);
+        private STexture _CoverTextureSmall = new STexture(-1);
+        private STexture _CoverTextureBig = new STexture(-1);
+        private bool _CoverBigLoaded = false;
 
         public CCategory(string name)
         {
             Name = name;
         }
 
+        public STexture CoverTextureSmall
+        {
+            get { return _CoverTextureSmall; }
+
+            set
+            {
+                _CoverTextureSmall = value;
+            }
+        }
+
+        public STexture CoverTextureBig
+        {
+            get
+            {
+                if (_CoverBigLoaded)
+                    return _CoverTextureBig;
+                else
+                    return _CoverTextureSmall;
+            }
+            set
+            {
+                if (value.index != -1)
+                {
+                    _CoverTextureBig = value;
+                    _CoverBigLoaded = true;
+                }
+            }
+        }
+
         public CCategory(string name, STexture CoverSmall, STexture CoverBig)
         {
             Name = name;