herf跳转修改 + 增加用户时权限判断
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/pages/common/header.jsp