hge
Merge branch 'easytrip' of https://github.com/Zuohr/flweekr into
easytrip

Conflicts:
	flweekr/WebContent/WEB-INF/detail.jsp