stage_2
Merge branch 'develop' of https://github.com/guetar/verteilte_systeme_lab2 into develop

Conflicts:
	src/main/java/proxy/Proxy.java