更新

新添加了对权限检查的模块
Merge branch 'master' of https://github.com/wikimo/jinbi.git

Conflicts:
	WebContent/users/userslist.jsp
更新
更新
更新
Merge branch 'master' of https://github.com/wikimo/jinbi

Conflicts:
	WebContent/public/xhtml/admin_diet.html
	WebContent/public/xhtml/admin_search.html
	WebContent/public/xhtml/admin_soma-editor.html
	WebContent/public/xhtml/admin_soma.html
	WebContent/public/xhtml/admin_user-group-add.html
	WebContent/public/xhtml/admin_user-group-user.html
	WebContent/public/xhtml/admin_user-group.html
	WebContent/public/xhtml/admin_user-info-editor.html
	WebContent/public/xhtml/admin_user-info.html
	WebContent/public/xhtml/admin_user-operation-add.html
	WebContent/public/xhtml/admin_user-operation.html
	WebContent/public/xhtml/admin_user-role-add.html
	WebContent/public/xhtml/admin_user-role-alter.html
	WebContent/public/xhtml/admin_user-role.html
	WebContent/public/xhtml/admin_user-rolegroup-add.html
	WebContent/public/xhtml/admin_user-rolegroup-alter.html
	WebContent/public/xhtml/admin_user.html
	WebContent/public/xhtml/css/style.css
	WebContent/public/xhtml/login.html
更新