Watermark
Use borders for event colour
Update event actions
Metadata moved to common template
EventAction changes
updated declaration of printPDF()
[OE-2695] module api class
Fix print method
[OE-2714] updated to use the new handleButton method
Merge branch 'release/1.3-moorfields' of github.com:openeyes/OphDrPrescription into release/1.3-moorfields
updated to the new printPDF definition
[OE-2709] order drug frequency rows by display order
[OE-2664] first bash at standardised javascript passthrough from the controllers.
+ js cleanup and print method consolidation
+ fix consultant name retrieval for printing
Merge branch 'jira/2664' into release/1.3-moorfields

Conflicts:
	assets/js/module.js
Merge branch 'release/1.3-moorfields' of github.com:openeyes/OphDrPrescription into release/1.3-moorfields
Update copyright message
Merge branch 'release/1.3-moorfields' into feature/orbis

Conflicts:
	controllers/DefaultController.php