deleted:    src/main/webapp/WEB-INF/views/resources/xsl/main_page_menu.html
	modified:   pom.xml
	modified:   src/main/java/com/vteam/xml_project/api/CategoryAPI.java
	modified:   src/main/java/com/vteam/xml_project/api/ProductAPI.java
	modified:   src/main/java/com/vteam/xml_project/dto/CategoryDTO.java
	modified:   src/main/java/com/vteam/xml_project/dto/CategoryListDTO.java
	modified:   src/main/java/com/vteam/xml_project/dto/ProductDTO.java
	modified:   src/main/java/com/vteam/xml_project/service/ProductService.java
	modified:   src/main/java/com/vteam/xml_project/util/XMLUtil.java
	modified:   src/main/webapp/WEB-INF/spring-servlet.xml
	modified:   src/main/webapp/WEB-INF/views/product_list.jsp
	modified:   src/main/webapp/WEB-INF/views/resources/js/category.js
	src/main/java/com/vteam/xml_project/context/
	src/main/webapp/WEB-INF/views/resources/xsl/category.xsl
bla bla
Merge branch 'master' of https://github.com/hunterbmt/xml_project