Merge origin/master

Conflicts:
	src/java/recruitingSystem/view/RecruiterManager.java
	web/administration.xhtml
	web/showCV.xhtml
Merge origin/master

Conflicts:
	src/java/recruitingSystem/view/RecruiterManager.java
	web/administration.xhtml
	web/showCV.xhtml
Merge origin/master

Conflicts:
	web/templates/header.xhtml