fix bug
Merge branch 'master' of https://github.com/antme/wxoo

Conflicts:
	src/main/webapp/page/628/detailed.jsp