add playlists
Merge branch 'master' of github.com:andufratu/hmu
Merge branch 'master' of github.com:andufratu/hmu
Merge conflicts