Merge origin/master

Conflicts:
	web/workaoe.xhtml
Merge origin/master

Conflicts:
	src/java/recruitingSystem/view/RecruiterManagerAdmin.java
Merge origin/master

Conflicts:
	src/java/recruitingSystem/view/RecruiterManagerAdmin.java