Profile pics and start of settings
mail_to link for admin page
Merge branch 'mailer-button'
merging to master prep
Merge branch 'master' into mailer-button