fix images
Merge branch 'master' into heroku-master