回滚
Merge branch 'master' of https://github.com/hanchilin/SSH

Conflicts:
	src/main/resources/struts.xml
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/buyTickets.jsp
修改