Merge pull request #54 from Edzelopez/GEP-19

GEP-35 Additional work on grantapplications
GEP-35 bug fixes