unfinished delete encounter
unfinished labrequest
unfinished retrieve previous referrals
Merge branch 'master' into working
Merge branch 'master' into working

Conflicts:
	MainActivity/src/com/example/model/LabRequest.java
working copy
unfinished working
deletes related data upon untag encounter
Merge with xian

Conflicts:
	MainActivity/AndroidManifest.xml
	MainActivity/src/com/example/android/navigationdrawerexample/InitializeActivity.java
	MainActivity/src/com/example/android/navigationdrawerexample/MainActivity.java
	MainActivity/src/com/example/android/navigationdrawerexample/RegisterActivity.java
	MainActivity/src/com/example/android/navigationdrawerexample/TagPatientActivity.java
	MainActivity/src/com/example/android/navigationdrawerexample/UntagPatientActivity.java
	MainActivity/src/com/example/database/Data.java
	MainActivity/src/com/example/database/DatabaseHandler.java
	MainActivity/src/com/example/database/EncounterAdapter.java
	MainActivity/src/com/example/database/PatientAdapter.java
	MainActivity/src/com/example/model/LabRequest.java