Merge pull request #645 from jonezy/development

just synching things up.
Merge pull request #650 from shutter111/master

F56 Model page update
Payment Calculator Edits
Merge pull request #651 from tonyrd/development

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

Development
Calculator resource updates