email config
email config for dev and test
Merge branch 'master' into inwoods