KFSCNTRB-2122 pulling into git
Merge pull request #74 from kkronenb/KFSCNTRB-2122

KFSCNTRB-2122 pulling into git
KFSTI-543 / KFSTI-481 update license header and code to acommodate vm files and avoid apache licensed files
KFSTI-543 / KFSTI-481 fixed initial copyright date
Merge pull request #76 from bhutchinson/kfsti-481

KFSTI-497 / KFSTI-478 - LicenseHeaderUpdate changes to support AGPL
KFSTP-1534: change C&G Invoice Create doc service to find object types by basic accounting category.  Also hard-code basic accounting categories, as they are dictated by an outside body and should not change that much
Merge pull request #77 from smith750/KFSTP-1534

KFSTP-1534
KFSTI-481 update license headers
KFSTI-543 update LicenseHeaderUpdate - leave apache license in springframework source
KFSTI-481 update license headers - dates/leave apache in springframework source
Merge pull request #78 from bhutchinson/kfsti-481

KFSTI-478 update licenses to AGPL for 5.4
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
Merge branch 'KFSTP-1503' of https://github.com/kkronenb/kfs into KFSTP-1503