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

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

VocaluxeLib/Menu/IMenu.cs

@@ -628,7 +628,8 @@ namespace Vocaluxe.Menu
     public enum EPlaybackLib
     {
         PortAudio,
-        OpenAL
+        OpenAL,
+        Gstreamer
     }
 
     public enum EWebcamLib
@@ -647,7 +648,8 @@ namespace Vocaluxe.Menu
 
     public enum EVideoDecoder
     {
-        FFmpeg
+        FFmpeg,
+        Gstreamer
     }
 
     public enum ESongMenu