Merge branch 'master' of https://github.com/scnakandala/jobshadowing

Conflicts:
	libs/dbfunctions.php