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

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

	modified:   src/main/java/com/vteam/xml_project/api/AdminAPI.java
	modified:   src/main/java/com/vteam/xml_project/api/ProductAPI.java
	modified:   src/main/java/com/vteam/xml_project/api/UserAPI.java
	modified:   src/main/java/com/vteam/xml_project/context/listener/ApplicationListenerBean.java
	modified:   src/main/java/com/vteam/xml_project/service/BidService.java
	modified:   src/main/java/com/vteam/xml_project/service/ProductService.java
	modified:   src/main/java/com/vteam/xml_project/service/UserService.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/css/product.css
	modified:   src/main/webapp/WEB-INF/views/resources/js/login.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/search.js
	modified:   src/main/webapp/WEB-INF/views/resources/xml/main_page_menu.xml
	modified:   src/main/webapp/WEB-INF/views/resources/xsl/category.xsl