Merge origin/master

Conflicts:
	src/main/java/edu/mum/cs544/controller/VirtualPatient.java
	src/main/java/edu/mum/cs544/model/Patient.java
	src/main/webapp/Presentation/UserRegistration.xhtml
	src/main/webapp/Presentation/home.xhtml
Merge origin/master
Adding a specialization catagory, viewing and editing doctor list done.
Adding a specialization catagory, viewing and editing doctor list done.
Adding a specialization catagory, viewing and editing doctor list done.
Merge origin/master

Conflicts:
	src/main/java/edu/mum/cs544/model/Category.java
	src/main/java/edu/mum/cs544/model/Doctor.java