artist/song templates consolidated
Merge pull request #185 from Petercopter/popular-new-consolidation

artist/song templates consolidated