+ ensure only try to save enclosure to letter when actual letters are in the form element, avoiding validation exception being raised
[OE-2648] refactored correspondence shortcode system
[OE-2470] fixed CSRF bug
Merge branch 'master' into develop
Merge branch 'develop' into feature/dr-function