Merge origin/master

Conflicts:
	src/java/recruitingSystem/view/RecruiterManagerAdmin.java
	web/templates/footer.xhtml
	web/templates/header.xhtml
Merge origin/master

Conflicts:
	src/java/recruitingSystem/view/RecruiterManagerAdmin.java
	web/templates/footer.xhtml
	web/templates/header.xhtml
Merge origin/master