Merge branch 'hotfix-activity-edits'
Now notification emails will be sent when niqati codes are ordered, approved or rejected
New email templates for niqati
Merge branch 'hotfix-niqati-notifications' into develop