hanges in testData
Merge branch 'master' of https://github.com/thebillkidy/KdG_IAO301A

Conflicts:
	Databanken & Middleware/Examen/Java/.idea/workspace.xml
Changes in Zone, TicketType
Merge branch 'master' of https://github.com/thebillkidy/KdG_IAO301A