Merge branch 'upgrade-3.5.2'
Add plugin wp-sendgrid
Merge branch 'sendgrid' into staging
Revert customization
Update readme
Merge branch 'sendgrid' into staging