Edited patient filetree
Merge https://github.com/the-river/ResearchDatabase

Conflicts:
	css/table.css
fixed merge error