更新
Merge branch 'master' of https://github.com/wikimo/jinbi

Conflicts:
	src/com/jinbi/service/impl/UserGroupServiceImpl.java