[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.
[OE-2933] fixed cc rendering bug
[OE-2933] html character rendering bugfix
Merge branch 'release/1.4-moorfields' into feature/contacts
[OE-2716] refactored how macros are processed when loading the create form.
[OE-260] Site_id moved from cookie to session
Merge branch 'release/1.3-moorfields' into release/1.4-moorfields
Merge branch 'release/1.4-moorfields' into feature/contacts
[OE-3012] fixed save and print not printing all pages
[OE-2710] correspondence bugfixes, re-enable the last_stringgroup paragraph feature if the user removes all of the text in the body field.
[OE-3016] updated icons
Merge branch 'release/1.3-moorfields' into release/1.4-moorfields
Merge branch 'feature/contacts' into release/1.4-moorfields
Merge branch 'release/1.2-moorfields' into release/1.3-moorfields
Merge branch 'master' into develop

Conflicts:
	controllers/DefaultController.php
[OE-2716] support for non-located contacts