Update navigation
[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
Use borders for event colour
Update event actions
Metadata moved to common template
EventAction changes
+ only show consultant entry for medical specialty firms
+ handle firm not having consultant assigned for user search OE-2643
Merge branch 'release/1.3-moorfields' of github.com:openeyes/OphCoCorrespondence into release/1.3-moorfields
Change letter font to sans-serif (arial/helvetica)
Merge branch 'release/1.2-moorfields' into release/1.3-moorfields

Conflicts:
	controllers/DefaultController.php
Fall back on Address country suppression
fixed declaration of printPDF()
[OE-2695] module api class
fixed printHTML method definition
[OE-2714] updated the buttons to use the new handleButton() method