aa

aa
Merge branch 'master' of https://github.com/SkyeSong38/huayoupro

Conflicts:
	WebRoot/WEB-INF/classes/beans.xml
	WebRoot/WEB-INF/classes/com/yinxing/ranqi/action/ProjectAction.class
	WebRoot/WEB-INF/classes/com/yinxing/ranqi/service/ProjectService.class
	WebRoot/WEB-INF/classes/struts.xml
	src/beans.xml
	src/struts.xml