test Server
Merge origin/master

Conflicts:
	src/vss/rmi/diningphilos/client/MainServer.java