Merge branch 'research' into diagnosis
Add presenting complaint modal

Refs openhealthcare/elcid#359 openhealthcare/elcid#360
openhealthcare/elcid#361
Merge branch 'opat' into diagnosis

Conflicts:
	opal/static/js/opal/controllers/add_episode.js
	opal/templates/episode_list.html
	opal/urls.py
	opal/views.py
Initialise episode field if not set
Merging diagnosis
Enables OPAT flow, and episode pathways for OPAT.