change in references
merge conflict fix

Conflicts:
	Software V1/RemiseSysteem Groep B/RemiseSysteem Groep
B/BeheerApplicatie.cs