Added some stuff
Merge branch 'develop-publicPlaylists' into develop
Merge branch 'develop' of https://github.com/confa/Azimuth into develop