dai1
戴木木Merge remote-tracking branch 'origin/xuetai1' into xuetai1

Conflicts:
	WebRoot/WEB-INF/jsp/backend/index.jsp
	src/cn/com/config/spring/applicationContext-dao.xml
	src/cn/com/config/spring/applicationContext-service.xml
	src/struts.xml