update
Merge branch 'master' of https://github.com/mach-b/DMS

Conflicts:
	RMI/build/classes/peerNode/PeerNode$1.class
	RMI/build/classes/peerNode/PeerNode$2.class
	RMI/build/classes/peerNode/PeerNode.class