z1

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

Conflicts:
	src/main/java/com/vteam/xml_project/context/listener/ApplicationListenerBean.java

	modified:   src/main/java/com/vteam/xml_project/api/AdminAPI.java
	modified:   src/main/java/com/vteam/xml_project/api/BidAPI.java
	modified:   src/main/java/com/vteam/xml_project/api/CategoryAPI.java
	modified:   src/main/java/com/vteam/xml_project/api/OrderHistoryAPI.java
	modified:   src/main/java/com/vteam/xml_project/api/ProductAPI.java
	modified:   src/main/java/com/vteam/xml_project/api/TagsAPI.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/dto/UserDTO.java
	new file:   src/main/java/com/vteam/xml_project/dto/UserListDTO.java
	modified:   src/main/java/com/vteam/xml_project/hibernate/dao/ProductDAO.java
	modified:   src/main/java/com/vteam/xml_project/hibernate/dao/UserDAO.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/java/com/vteam/xml_project/util/XMLUtil.java
	new file:   src/main/java/user.xml
	modified:   src/main/webapp/WEB-INF/views/product_list.jsp
	modified:   src/main/webapp/WEB-INF/views/resources/js/login.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/product.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/search.js