config email
Merge branch 'config_email' into develop