불필요한 resources/js 폴더의 .js파일 삭제 + 주문 UI Test 중
Merge branch 'master' of https://github.com/hjra/may5.git

Conflicts:
	CShop/src/main/java/net/may5/controller/OrderController.java
	CShop/src/main/webapp/WEB-INF/tiles2-defs/templates/header.jsp
	CShop/src/main/webapp/WEB-INF/tiles2-defs/templates/mngMenu.jsp
	CShop/src/main/webapp/WEB-INF/views/cst/about/about.jsp
	CShop/src/main/webapp/WEB-INF/views/cst/menu/menuList.jsp
	CShop/src/main/webapp/resources/css/web-layout.css
	CShop/src/main/webapp/resources/css/web.css
Merge branch 'master' of https://github.com/hjra/may5.git
상단메뉴 conflict error 수정
Merge branch 'master' of https://github.com/hjra/may5.git