email subscribe
Merge branch 'master' into email_sub
email entry styling