Merge origin/master

Conflicts:
	OnlineDoctorWebApp/src/main/webapp/administratorView.xhtml
	OnlineDoctorWebApp/src/main/webapp/doctorView.xhtml
	OnlineDoctorWebApp/src/main/webapp/index.xhtml