增加消息中心查看他人个人资料
Merge remote-tracking branch 'origin/master'
修改bug
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	PinPeng/WebRoot/WEB-INF/page/noticecenter.jsp