Merge origin/master

Conflicts:
	SysteemAdmin/AdminLogin.php
Merge origin/master
Merge origin/master

Conflicts:
	SysteemAdmin/AdminLogin.php
Merge origin/master

Conflicts:
	SysteemAdmin/AdminLogin.php
Merge origin/master
Merge origin/master

Conflicts:
	SysteemAdmin/AdminTicketWijzigen.php
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	SysteemAdmin/AdminTicketWijzigen.php
Merge origin/master
Create AdminFactuurBetaald.php
Update AdminFactuurBetaald.php
Merge origin/master

Conflicts:
	SysteemAdmin/AdminFactuuroverzicht.php
Merge LeyonCourtz/master

Conflicts:
	SysteemKlant/klantticketwijzigen.php
Merge origin/master