song show resorted
moving more logic back
artist category refactor
Merge pull request #77 from Petercopter/song-sort-fixes

Song sort fixes