Don't play snippet preview in the song list
Fixing merge conflicts

Merge branch 'master' of github.com:casesandberg/hella