Merge origin/master

Conflicts:
	src/java/recruitingSystem/view/JobSeekerManager.java
	src/java/recruitingSystem/view/JobSeekerManager_workapplicaiton.java
Merge origin/master

Conflicts:
	src/java/recruitingSystem/view/JobSeekerManager.java
	src/java/recruitingSystem/view/JobSeekerManager_workapplicaiton.java
Merge origin/master

Conflicts:
	web/showCV.xhtml