debug
Merge branch 'master' of https://github.com/liushuang/gaokaoshu

Conflicts:
	src/main/webapp/WEB-INF/pages/detail.jsp