bug fixing
emails notification fixes
removed debugging
Merge branch 'develop' into poma-6164