Ja watte
Merge remote-tracking branch 'origin/master'

Conflicts:
	CompendaServer/Activiteit_CompareOrders.php
Ja watte