Merge remote-tracking branch 'origin/development'
Shuffle artists.
Merge remote-tracking branch 'heroku/master' into development