Conflicts: VocaluxeLib/Menu/CNameSelection.cs VocaluxeLib/Menu/CPlaylist.cs VocaluxeLib/Menu/CText.cs VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs VocaluxeLib/Structs.cs VocaluxeLib/VocaluxeLib.csproj VocaluxeLib/Xml/CXMLReader.cs
Conflicts: VocaluxeLib/Menu/CNameSelection.cs VocaluxeLib/Menu/CPlaylist.cs VocaluxeLib/Menu/CText.cs VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs VocaluxeLib/Structs.cs VocaluxeLib/VocaluxeLib.csproj VocaluxeLib/Xml/CXMLReader.cs