.
Merge branch 'master' of github.com:pluto-/Gcom

Conflicts:
	nameServer/src/main/java/gcom/nameserver/NameService.java
	utils/src/main/java/gcom/utils/RmiServer.java