Merge branch 'master' into flo
Merge branch 'master' into flo
Strip trailing blank lines
Spun off cost info updating from other acquisitions stuff
Sort payments by year, fund, and subscription start date
Added getPaymentAmountChangeFromPreviousYear method to ResourcePayment class
Overhaul for cost history enhancement
Overhaul for cost history enhancement
Cleanup: Remove stray conflict marker
Cleanup: Make indents consistent
Cleanup: Make indents consistent
Add year-over-year increase to displayed cost data
Fix several small bugs introduced in cost history enhancement
Cleanup: Make indents more consistent
Remove debugging cruft
Remove stray blank lines at end of file
Cleanup: fix indents
Cleanup: fix indents
Remove hardcoded table.linedFormTable widths
Add previous_year function
Tweak table widths
Cleanup: Remove stray spaces in HTML tags
Remove cost history updating cruft
Fix copyright statement
Cleanup: End file with newline character