Merge branch 'master' of https://github.com/CertusEmployment/CertusEmployment

Conflicts:
	bedrijf/bedrijf-addkandidaat.php
conflict solve

solve conflict?