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
Merge pull request #89 from Edzelopez/GEP-53

GEP-53 Multiple fixes and commits
GEP-55 Moved common code to base class
Merge pull request #90 from Edzelopez/GEP-53

GEP-55 Moved common code to base class
-- GEP-53, removed cruft