Merge branch 'temp'
New layout for playlists

yar
Merge branch 'temp' into gh-pages