Performance improvement sending emails, fix zip code on bottom of email.
Merge branch 'production' into test
Merge branch 'test' into staging