added some playlist controller and specs
added to playlist controller and spec
merging
fix merge conflicts