Merge origin/master

Conflicts:
	src/main/resources/META-INF/persistence.xml
Merge origin/master

Conflicts:
	src/main/java/edu/mum/cs544/controller/Registration.java
	src/main/java/edu/mum/cs544/model/Doctor.java
	src/main/webapp/Presentation/AdminPortal.xhtml
	src/main/webapp/Presentation/DoctorRegistration.xhtml
Merge origin/master

Conflicts:
	src/main/java/edu/mum/cs544/controller/Registration.java
	src/main/java/edu/mum/cs544/model/Doctor.java
	src/main/webapp/Presentation/AdminPortal.xhtml
	src/main/webapp/Presentation/DoctorRegistration.xhtml
Merge origin/master

Conflicts:
	src/main/java/edu/mum/cs544/controller/DoctorBean.java
	src/main/webapp/Presentation/PatientPortal.xhtml