Merge branches 'master' and 'playlist'
[zukebox] / zukebox_server / src / playlist / __init__.py