1

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

Conflicts:
	src/main/java/com/vteam/xml_project/api/BidAPI.java
	src/main/java/com/vteam/xml_project/service/BidService.java
	src/main/webapp/WEB-INF/views/resources/js/product.js

	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/ProductAPI.java
	modified:   src/main/java/com/vteam/xml_project/api/UserAPI.java
	modified:   src/main/java/com/vteam/xml_project/controller/MainController.java
	modified:   src/main/java/com/vteam/xml_project/dto/ProductDTO.java
	modified:   src/main/java/com/vteam/xml_project/hibernate/dao/CategoryDAO.java
	modified:   src/main/java/com/vteam/xml_project/hibernate/dao/ProductDAO.java
	modified:   src/main/java/com/vteam/xml_project/service/BidService.java
	modified:   src/main/java/com/vteam/xml_project/service/CategoryService.java
	modified:   src/main/java/com/vteam/xml_project/service/ProductService.java
	modified:   src/main/webapp/WEB-INF/views/resources/css/product.css
	modified:   src/main/webapp/WEB-INF/views/resources/js/admin_product.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/login.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/product.js
	new file:   src/main/webapp/WEB-INF/views/test.jsp