Still incomplete update profile page
Still incomplete update profile page
Merge origin/master

Conflicts:
	src/java/controller/patient.java