remove namespace constant conflict
update mails
temp debug info
Merge branch 'feature/notifications' into new_staging

* feature/notifications:
  temp debug info
  update mails
  remove namespace constant conflict