zhongwu
Conflicts:
	src/cn/com/config/spring/applicationContext-dao.xml