Fixed merge issues. Updated libBass. Modernized project.