fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	json/replicated.json
fixes
Merge branch 'master' of https://github.com/bartmoons/gedistribueerdesystemen

Conflicts:
	bin/be/uantwerpen/FileReceiverThread.class
	json/replicated.json
Merge branch 'master' of https://github.com/bartmoons/gedistribueerdesystemen