xuqiu
del classes
ignore
del lib
igore
Merge branch 'master' of github.com:drunping/whcmreg

Conflicts:
	WebRoot/WEB-INF/classes/com/whcm/action/AcademyAction.class
	WebRoot/WEB-INF/classes/com/whcm/dao/CommonExecute$1.class
	WebRoot/WEB-INF/classes/com/whcm/dao/CommonExecute$2.class
	WebRoot/WEB-INF/classes/com/whcm/dao/CommonExecute$3.class
	WebRoot/WEB-INF/classes/com/whcm/dao/CommonExecute$4.class
	WebRoot/WEB-INF/classes/com/whcm/dao/CommonExecute$5.class
	WebRoot/WEB-INF/classes/com/whcm/dao/CommonExecute.class
	WebRoot/WEB-INF/classes/com/whcm/service/AcademyService.class
	WebRoot/WEB-INF/classes/com/whcm/util/send/SimpleMailSender.class