Merge origin/master

Conflicts:
	SysteemAdmin/AdminTicketBeantwoorden.php
	SysteemAdmin/stijl.css
	SysteemKlant/klantoverzicht.php
	SysteemKlant/klantticketaanmaken.php
	SysteemKlant/klantticketinzien.php
	SysteemKlant/klantticketwijzigen.php
Merge origin/master
Merge origin/master

Conflicts:
	SysteemKlant/klantlogin.php
Merge origin/master

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

Conflicts:
	SysteemKlant/klantlogin.php
Merge origin/master

Conflicts:
	SysteemKlant/klantlogin.php
Merge origin/master

Conflicts:
	SysteemKlant/klantlogin.php