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

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

	modified:   pom.xml
	modified:   src/main/java/com/vteam/xml_project/api/ProductAPI.java
	modified:   src/main/java/com/vteam/xml_project/dto/ProductDTO.java
	modified:   src/main/java/com/vteam/xml_project/dto/ProductListDTO.java
	new file:   src/main/java/com/vteam/xml_project/hibernate/dao/SearchCacheDAO.java
	new file:   src/main/java/com/vteam/xml_project/hibernate/orm/SearchCache.java
	modified:   src/main/java/com/vteam/xml_project/service/ProductService.java
	modified:   src/main/java/com/vteam/xml_project/service/UserService.java
	new file:   src/main/java/com/vteam/xml_project/util/XMLUtil.java
	new file:   src/main/java/test.java
	modified:   src/main/resources/db/SQLScript.sql
	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/css/product.css
	modified:   src/main/webapp/WEB-INF/views/resources/img/body-bg.png
	modified:   src/main/webapp/WEB-INF/views/resources/js/bid.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/product.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/vteam.js
	new file:   src/main/webapp/WEB-INF/views/resources/xml/main_page_menu.xml
	new file:   src/main/webapp/WEB-INF/views/resources/xsl/main_page_menu.html
	new file:   src/main/webapp/WEB-INF/views/resources/xsl/main_page_menu.xsl
	new file:   src/products.xml