some separation on staging and production
add mail broadcast
Merge branch 'develop'