解决冲突
Merge branch 'master' of https://github.com/wayne0332/xiaojh.git

Conflicts:
	WebRoot/WEB-INF/web/forepart/merchantMain.jsp
	src/com/tjxjh/action/ClubAction.java
	src/com/tjxjh/action/SearchAction.java