Merge pull request #645 from jonezy/development

just synching things up.
Payment Calculator Edits
Merge pull request #651 from tonyrd/development

Payment Calculator Edits
Merge pull request #652 from RichmondDay/development

Development