Merge danny into develop
kaartsend
Merge raymon into develop

Conflicts solved:
	toepenTest/toepenTest/MainWindow.xaml.cs