S3 - Sendgrid setup - #1
Merge branch 'sendgrid_setup' into umanni-develop