Merge origin/master

Conflicts:
	OnlineDoctorWebApp/src/main/java/edu/mum/ea/onlineDoctor/controller/ManageDoctorBean.java
	OnlineDoctorWebApp/src/main/webapp/managedoctor.xhtml
Merge origin/master

Conflicts:
	OnlineDoctorWebApp/src/main/resources/META-INF/persistence.xml