asdasd
Merge remote-tracking branch 'origin/Developers' into Verzameling

Conflicts:
	Aedificium6N/Aedificium6N/Aedificium6N.csproj