commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	SystemY nameServer/src/be/uantwerpen/server/XMLParser.java