giao dien checkout
Merge branch 'master' of github.com:khanhminh/CellPhoneShop

Conflicts:
	cellphoneshop/src/main/webapp/WEB-INF/config/spring-struts-config.xml
add file CheckoutController.java, checkout.jsp