[OE-2716] contacts refactoring
[OE-2716] contacts refactoring
Merge branch 'release/1.3-moorfields' into feature/contacts
Merge branch 'release/1.3-moorfields' into feature/contacts
[OE-2716] contacts refactoring now reasonably stable, needs more testing.
Merge branch 'release/1.4-moorfields' into feature/contacts
[OE-2716] refactored how macros are processed when loading the create form.
Merge branch 'release/1.4-moorfields' into feature/contacts
Merge branch 'feature/contacts' into release/1.4-moorfields