Merge origin/master

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