Edit the result.jsp and template-top.jsp by xincheng
Merge branch 'master' of git@github.com:wgychris/Task8.git

Conflicts:
	TravelPlan/WebContent/result.jsp
update the result.jsp and resultAction, add more pictures by xincheng