--GEP-38, fixed email tokens when grant application is submitted for On behalf
Merge pull request #58 from pradpnayak/GEP-38

--GEP-38, fixed email tokens when grant application is submitted for On ...
Merge pull request #59 from Edzelopez/GEP-19

GEP-37 Bug fixes
GEP-37 Bug fixes