settings and playlist
Merge branch 'master' of github.com:ccaballero/settings

merge