report 91%。
Merge branch 'master' of https://github.com/waitwind/wmsx

Conflicts:
	src/main/webapp/report.html