T -- dec3
Merge https://github.com/the-river/ResearchDatabase

Conflicts:
	patient/view-patient.php
Patient core pages
Merge https://github.com/the-river/ResearchDatabase