Merge branch 'develop'
Add stanza for test
No idea why the yaml references didn't work, but I took them out
Merge branch 'develop'
Add active playlist to user
Implement next/previous controls on jukebox
Bugfixes