Merge remote-tracking branch 'origin/master'

Conflicts:
	json/local.json
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/be/uantwerpen/Client.class
	bin/be/uantwerpen/NameServer.class
	hashmap.properties