Merge origin/master

Conflicts:
	src/main/java/com/soen/hasslefree/models/PhysicianAvailability.java
	src/main/java/com/soen/hasslefree/models/User.java