Conflicts: Vocaluxe/Base/CConfig.cs Vocaluxe/Lib/Playlist/CPlaylistFile.cs Vocaluxe/Screens/CScreenSong.cs VocaluxeLib/CHelper.cs VocaluxeLib/Menu/CMenu.cs VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs