a
Merge branch 'master' of https://github.com/hjra/May5v2.git

Conflicts:
	CShopVer2/src/main/webapp/WEB-INF/views/cst/order/payment.jsp