change
Merge branch 'master' of https://github.com/allen4z/Gogo.git

Conflicts:
	src/com/gogo/domain/Group.java