vvvvvvvvvvvvv
Merge branch 'master' of https://github.com/caining618/ytf_cust

Conflicts:
	src/main/webapp/WEB-INF/xutils-webapp.xml
	src/main/webapp/index.jsp
	src/main/webapp/term/module_management.jsp