修改
Merge branch 'master' of https://github.com/wikimo/jinbi.git

Conflicts:
	WebContent/WEB-INF/web.xml
	WebContent/users/usersshow.jsp