Merge origin/master

Conflicts:
	src/main/java/edu/mum/cs544/model/Category.java
	src/main/java/edu/mum/cs544/model/Doctor.java
	src/main/resources/META-INF/persistence.xml
Merge origin/master