Merge origin/master

Conflicts:
	src/java/recruitingSystem/controller/JobSeeker.java
Merge origin/master

Conflicts:
	src/java/recruitingSystem/controller/JobSeeker.java