Updated Proxy
Merge branch 'master' of https://github.com/alexandrelucchesi/tr2-final

Conflicts:
	tr2-server/src/tr2/server/HelloWorld.java
Updated MulticastReceiver to notify Proxy
Merge branch 'master' of https://github.com/alexandrelucchesi/tr2-final

Conflicts:
	tr2-server/src/multicast/MCListener.java
	tr2-server/src/tr2/server/HelloWorld.java
Merge branch 'master' of https://github.com/alexandrelucchesi/tr2-final