work on moving control-related javascript into base control
javascript now working for exchange controls and receipts
remove unused (old style) controls
refactor 'save' and 'edit' to remove duplicate code
resolved merge conflict
tweak edit/save changes to fix errors
Merge branch 'development' into NewControlsOnly
Merge branch 'development' into NewControlsOnly
align approver name better
Merge branch 'NewControlsOnly' into development