Merge pull request #74 from Soundnode/develop

Add improvement to show current/active song
fix merge conflict