Merge origin/master

Conflicts:
	web/templates/sections/viewJobs.xhtml
Merge origin/master

Conflicts:
	web/templates/sections/viewJobs.xhtml
Merge origin/master

Conflicts:
	src/java/com/cs545/jobportal/messages.properties