Updating ResidentMedicineActivity
Merge branch 'master' of https://github.com/nutsiepully/medmanage
Fixed up ResidentMedicineActivity
Merge branch 'master' of https://github.com/nutsiepully/medmanage

Conflicts:
	res/layout/resident_medicine.xml
	src/org/vcs/medmanage/ResidentMedicineActivity.java