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

Conflicts:
	core/src/main/java/gcom/utils/CassandraNameService.java