check if prod or test/dev env for mail sending
Merge branch 'master' into admin