basepath
path
path
Merge branch 'master' of https://github.com/caining618/ytf_cust.git

Conflicts:
	src/main/webapp/term/module_add.jsp
	src/main/webapp/term/module_detail_center.jsp
	src/main/webapp/term/module_detail_org.jsp
	src/main/webapp/term/module_management.jsp
	src/main/webapp/term/module_market_apply.jsp
	src/main/webapp/term/module_order_center.jsp
	src/main/webapp/term/module_order_org.js
	src/main/webapp/term/module_order_org.jsp
	src/main/webapp/term/module_order_pop4.jsp
	src/main/webapp/term/module_order_pop5.jsp
	src/main/webapp/term/module_order_pop7.jsp
	src/main/webapp/term/module_orderapply.jsp
	src/main/webapp/term/module_statistical2.jsp