Merge pull request #63 from oliverds/master

Favicon upload + S3 + preview