Merge branch 'hotfix/add_send_mail'

* hotfix/add_send_mail:
  fix sending mail
fixed
Merge branch 'hotfix/fix_mailing' into develop

* hotfix/fix_mailing:
  fixed