Scheduler and mail notifications added
Merge branch 'mail-notifications' into develop
Merge branch 'develop'