I don't care

(he really does not)
Merge remote-tracking branch 'origin/master'

Conflicts:
	StamboomProject/nbproject/private/private.xml
	StamboomProject/src/stamboom/domain/Administratie.java