Merge branch 'dev'
Website icon added
Fixing s3 case issue
Merge branch 'master' of github.com:Irishsmurf/LastFM-PHP-Album-Collage