added sendgrid to config
Merge branch 'develop'