Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/be/uantwerpen/MulticastClient.class
	json/local.json
	json/replicated.json
	src/be/uantwerpen/MulticastClient.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	json/local.json
	json/replicated.json