default user image
Merge branch 'master' into heroku
heroku assets