fix sendgrid for dev
Merge branch 'master' into html-kickstart
fix confilcts