Begin Type 3
Merge remote-tracking branch 'origin/master' into TYPE_3
logic control: method aangepast en property aangepast
Merge remote-tracking branch 'origin/TYPE_2' into TYPE_3
IntersectionControl from base
Merge remote-tracking branch 'origin/TYPE_3' into TYPE_1