commit
Merge branch 'master' of https://github.com/hunterbmt/xml_project

Conflicts:
	src/main/webapp/WEB-INF/views/product_list.jsp

	modified:   pom.xml
	modified:   src/main/java/com/vteam/xml_project/api/AdminAPI.java
        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/api/TagsAPI.java
	new file:   src/main/java/com/vteam/xml_project/context/listener/ApplicationListenerBean.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/AdminService.java
	modified:   src/main/java/com/vteam/xml_project/service/ProductService.java
	modified:   src/main/java/com/vteam/xml_project/service/TagsService.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/admin_product.jsp
	modified:   src/main/webapp/WEB-INF/views/product_list.jsp
	modified:   src/main/webapp/WEB-INF/views/resources/js/admin_product.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/admin_tags.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/category.js
	new file:   src/main/webapp/WEB-INF/views/resources/xsl/category.xsl
	deleted:    src/main/webapp/WEB-INF/views/resources/xsl/main_page_menu.html