Merge origin/master

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

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

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

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

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

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

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

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

Conflicts:
	OnlineDoctorWebApp/src/main/java/edu/mum/ea/onlineDoctor/controller/PatientBean.java
	OnlineDoctorWebApp/src/main/webapp/talkToDoctor.xhtml