KFSTP-1502: update labels in collection activity report; add extra fields to results; remove no longer needed fields
Merge pull request #80 from smith750/KFSTP-1502

KFSTP-1502
Update krcr_parm_t.csv
Update krcr_parm_t.csv
KFSTP-1534: oops, the method where retrieveExpenseTypeCodes is called isn't itself called any longer.  Let's remove that method and call retrieveExpenseTypeCodes in the method which is called
Merge pull request #81 from smith750/KFSTP-1534

KFSTP-1534
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
Updating license headers for files Kuali Foundation modified
Merge pull request #89 from kkronenb/KFSTI-635

KFSTI-635 Updating license headers for files Kuali Foundation modified
KFSTP-1471: fix hard coding of proposal number at least in collectionActivityAwardInformation.tag; remove proposal number from ArGenericAttributes since it will always preclude KC name switching; fix places which had used ArGenericAttributes-proposalNumber so that they go to the externalizable business object implementation instead
Merge pull request #90 from smith750/KFSTP-1471

KFSTP-1471