Merge branch 'browsing'
Artist and album view now show album art
Merge branch 'master' into browsing