Merge pull request #148 from mayurjadhav/RG-195

RG-195 added grant incomplete field in grant table
Adding fixes from master to nei branch by creating a new commit
Merge pull request #151 from JoeMurray/fix-templates

Adding fixes from master to nei branch by creating a new commit