Databae Updates
Merge branch 'master' of https://github.com/sshiflett/MedCenter

Conflicts:
	res/layout/activity_nurse_patient_info.xml
	res/layout/activity_patient_main.xml
	src/awesomeapp/com/medcenter/NurseHome.java
	src/awesomeapp/com/medcenter/NursePatientInfo.java