KFSTP-1503 modified report fields
KFSTP-1503 modified report fields
Merge branch 'KFSTP-1503' of https://github.com/kkronenb/kfs into KFSTP-1503
Merge pull request #83 from kkronenb/KFSTP-1503

KFSTP-1503 modified report fields
KFSTP-1506: update collection activity to contracts & grants activity
KFSTP-1506: changed the document type name from COLA to CCA, which is a bit trickier to deal with
Merge pull request #84 from smith750/KFSTP-1506

KFSTP-1506
KFSTP-1593: change proposal number label in KC to be Award ID
Merge pull request #85 from smith750/KFSTP-1593

KFSTP-1593