Merge origin/master

Conflicts:
	SysteemKlant/klantlogin.php
Merge origin/master
Merge origin/master

Conflicts:
	SysteemKlant/klantlogin.php
Merge origin/master