group权限后台
Merge remote-tracking branch 'origin/miniyun_1.7' into miniyun_1.7

Conflicts:
	protected/models/db/UserGroupRelation.php