Fix images
Merge branch 'master' of github.com:JoakimSoderberg/catsnatch
Fix mailer.
Merge branch 'master' of github.com:JoakimSoderberg/catsnatch