Merge branch 'classic' into gh-pages
for real
fixed try...catch
reverted
ordering derp
fixed fresh load not playing new playlist bug
Merge branch 'gh-pages' into classic