Merge pull request #87 from Edzelopez/GEP-53

GEP-53 Adding code to form layer from buildform
-- fixed strict warnings for GEP-58
Merge pull request #88 from pradpnayak/GEP-50

-- fixed strict warnings for GEP-58
GEP-53 Removed code from hook and added to form
GEP-53 Removed code from hook and added to form
GEP-53 Multiple fixes, including fixes for grants display for on behalf of orgs on contacts dashboard