Merge origin/master

Conflicts:
	src/main/java/edu/mum/cs544/EJBs/DoctorEJB.java
	src/main/java/edu/mum/cs544/backingBeans/DoctorBean.java
	src/main/webapp/Presentation/sections/sidebarLeftDoctor.xhtml