merge match codes
Merge branch 'master' of https://github.com/bigv220/jobseeker

Conflicts:
	application/views/default/search-job-result.php
	application/views/default/search-jobseeker-result.php