RG-216 Fixed bugs for grantprograms for 4.4
Merge pull request #235 from Edzelopez/test

RG-216 Fixed bugs for grantprograms for 4.4