增加监测点
Merge branch 'master' of https://github.com/xiaozhujun/riskreport

Conflicts:
	web-app/nav.jsp