Update navigation
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
+ 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
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
[OE-2714] no point in passing an empty function
updated to the new printPDF definition.
[OE-2710] when selecting from the stringgroup dropdowns, if the selected dropdown came after one that was previously selected it puts the text on a new paragraph.  any keystrokes sent to the body text disables this feature.
[OE-2700] updated correspondence to use the new printing method.
+ resolves OE-2724 - removing spurious javascript from printout
+ resolves OE-2726 - only show print once after save and print on letter
[OE-2664] first bash at standardising the way javascript is passed through from the controllers.
Merge branch 'jira/2664' into release/1.3-moorfields

Conflicts:
	assets/js/module.js
	controllers/DefaultController.php