changes to js playlisting
Merge remote-tracking branch 'origin/master'