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

Conflicts:
	core/src/main/java/gcom/GroupManager.java