Added

save patient_id to preferences once patient is selected
Merge with my working editable

Conflicts:
	Preferences.java
Update

Fix Patient Info Expandable List Medical History