Merge origin/master

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