a
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/control/AllergyListActivity$adapter.class
	bin/classes/control/PatientListActivity$adapter.class
	bin/classes/model/datasource/DatabaseList.class