Merge remote-tracking branch 'origin/dev' into test

Conflicts:
	PHMS/src/main/java/com/cse3310/phms/ui/activities/AddMedicationActivity.java
Merge remote-tracking branch 'origin/dev' into test

Conflicts:
	PHMS/src/main/java/com/cse3310/phms/ui/activities/AddMedicationActivity.java
Merge remote-tracking branch 'origin/test' into dev
why
forgot this
oops
Merge remote-tracking branch 'origin/test' into dev
fix medication saving to DB incorrectly