Merge origin/master

Conflicts:
	src/main/java/Controller/ApplicantFacade.java