Merge pull request #6 from pradpnayak/AMGA-15

--more changes to code for AMGA-15
-- add enrollement date in smarty, AMGA-15