T -- dec3
This is a big one
-aFixed merge conflicts
Fixed the bugs that silus mentioned
Merge https://github.com/the-river/ResearchDatabase

Conflicts:
	patient/view-patient.php
Patient core pages
Merge https://github.com/the-river/ResearchDatabase
moderate html formatting - patients
Massive style fixes to php folder. It is pretty now :D
Updated all links to account.php.