add a playlist queue (doesn't work yet)
fix merge conflicts because of the rename of playlistEntry
Merge branch 'pepf-master'
Play functionality (crappy but working)