Merge pull request #1 from pradpnayak/AMGA-15

Amga 15
-- AMGA-15, added code to handle smarty date functions
Merge pull request #2 from pradpnayak/AMGA-15

-- AMGA-15, added code to handle smarty date functions
Merge branch 'master' of github.com:JMAConsulting/biz.jmaconsulting.emailsystem into AMGA-15
-- AMGA-19, fixed token for enrollment deadline
Merge pull request #3 from pradpnayak/AMGA-19

-- AMGA-19, fixed token for enrollment deadline
AMGA-15 Added support for point #22 from AMGA Emails
Merge pull request #4 from Edzelopez/AMGA-15

AMGA-15 Added support for point #22 from AMGA Emails
AMGA-15 Added additional condiitions to retrieve fewer results
Merge pull request #5 from Edzelopez/AMGA-15

AMGA-15 Added additional condiitions to retrieve fewer results
Merge branch 'master' of github.com:JMAConsulting/biz.jmaconsulting.emailsystem into AMGA-15