modfy code
modify test ， refactor
Merge remote-tracking branch 'origin/master'

Conflicts:
	api/api.exe
	api/common.go
	api/group.go
	api/groupSvc.go