Minor reformattings
Add labtest to research schema
Merge branch 'opat' into diagnosis

Conflicts:
	elcid/schema.py
	elcid/settings.py
	requirements.txt
WIP walk-in clinic
Remove walkin test model
Merge branch 'master' into walk-in

Conflicts:
	README.md
	elcid/settings.py
Merging opat
Merge remote-tracking branch 'origin/opat' into walk-in

Conflicts:
	elcid/schema.py
	elcid/settings.py
	requirements.txt
Add Observation column to Walk-in views
Diagnosis controllers should live in elcid
Hide teams section if there are no teams to choose from
Add new walk-in flow
Rename opal branch in requirements
Merging upstream walkin:
Only format non-null dates
Ignore databases
Update demographics template to include Study ID refs openhealthcare/opal-research#6
Move research study models for specific UCLH collection into this instance.
Allow alternative location display for scientists.
Hide PID from researchers. refs openhealthcare/opal-research#4
Bump brand and remote branches