nameserver
fixes
Merge branch 'master' of https://github.com/bartmoons/gedistribueerdesystemen

Conflicts:
	hashmap.properties