Merge branch 'master' into develop
Add last.fm toggle
Merge branch 'lastfm-enable' into develop
Fix timebar alignment
More sensible alignment for timebar, iconbar
Merge branch 'develop'