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

Conflicts:
	src/main/java/com/vteam/xml_project/service/UserService.java

	modified:   src/main/java/com/vteam/xml_project/api/AdminAPI.java
	modified:   src/main/java/com/vteam/xml_project/controller/AdminController.java
	modified:   src/main/java/com/vteam/xml_project/dto/OrderHistoryDTO.java
	modified:   src/main/java/com/vteam/xml_project/dto/OrderHistoryListDTO.java
	modified:   src/main/java/com/vteam/xml_project/dto/ProductDTO.java
	modified:   src/main/java/com/vteam/xml_project/dto/ProductListDTO.java
	modified:   src/main/java/com/vteam/xml_project/hibernate/dao/OrderHistoryDAO.java
	modified:   src/main/java/com/vteam/xml_project/hibernate/dao/ProductDAO.java
	modified:   src/main/java/com/vteam/xml_project/hibernate/orm/OrderHistory.java
	modified:   src/main/java/com/vteam/xml_project/service/AdminService.java
	modified:   src/main/java/com/vteam/xml_project/service/BidService.java
	modified:   src/main/java/com/vteam/xml_project/service/OrderHistoryService.java
	modified:   src/main/java/com/vteam/xml_project/service/UserService.java
	modified:   src/main/resources/db/upgrade_1.0.0.sql
	modified:   src/main/webapp/WEB-INF/views/admin_order.jsp
	new file:   src/main/webapp/WEB-INF/views/resources/js/admin_order.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/admin_product.js
	modified:   src/main/webapp/WEB-INF/views/resources/xsl/product.xsl
Merge branch 'master' of https://github.com/hunterbmt/xml_project