b
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$10.class
	WebRoot/WEB-INF/classes/com/yinxing/ranqi/action/ProjectAction$11.class
	WebRoot/WEB-INF/classes/com/yinxing/ranqi/action/ProjectAction$12.class
	WebRoot/WEB-INF/classes/com/yinxing/ranqi/action/ProjectAction$13.class
	WebRoot/WEB-INF/classes/com/yinxing/ranqi/action/ProjectAction$5.class
	WebRoot/WEB-INF/classes/com/yinxing/ranqi/action/ProjectAction$6.class
	WebRoot/WEB-INF/classes/com/yinxing/ranqi/action/ProjectAction$7.class
	WebRoot/WEB-INF/classes/com/yinxing/ranqi/action/ProjectAction$8.class
	WebRoot/WEB-INF/classes/com/yinxing/ranqi/action/ProjectAction$9.class
	WebRoot/WEB-INF/classes/com/yinxing/ranqi/action/ProjectAction.class
	WebRoot/WEB-INF/classes/com/yinxing/ranqi/service/ProjectService.class
	src/beans.xml