Merge origin/master

Conflicts:
	SysteemKlant/klantlogin.php
Merge origin/master

Conflicts:
	SysteemKlant/klantlogin.php
Merge origin/master

Conflicts:
	SysteemKlant/klantlogin.php
Merge origin/master

Conflicts:
	SysteemKlant/klantlogin.php
Merge origin/master

Conflicts:
	SysteemKlant/klantlogin.php
Merge origin/master

Conflicts:
	SysteemKlant/klantlogin.php
Merge origin/master

Conflicts:
	SysteemAdmin/AdminFactuuroverzicht.php
	SysteemAdmin/menu.php
Merge origin/master

Conflicts:
	SysteemAdmin/AdminFactuuroverzicht.php
	SysteemAdmin/menu.php