[OE-2167] fixed typo
[OE-2167] reversed previous commit (error)
[OE-2167] fixed the way moorfields site addresses are constructed.
[OE-2167] changed Cc to CC in the correspondence views
[OE-2630] hotfix for macros showing in the list where they shouldn't.
Merge branch 'release/1.2-moorfields' into release/1.3-moorfields