Fixed playlist features spec skipped 3
Editing queue features:
Fixed queue features spec, 2 skipped
Fixed merge conflicts
Fixed broken friendships migration
Merge branch 'rspecfix' of github.com:MadameSardine/pandapop into rspecfix
Rspec passing, 9 pending
Merge branch 'development' of github.com:MadameSardine/pandapop into rspecfix
Fixed merge conflict