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/BidAPI.java
	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
	modified:   src/main/java/com/vteam/xml_project/hibernate/dao/ProductDAO.java
	modified:   src/main/java/com/vteam/xml_project/hibernate/orm/Product.java
	modified:   src/main/java/com/vteam/xml_project/service/AdminService.java
	modified:   src/main/java/com/vteam/xml_project/service/ProductService.java
	modified:   src/main/webapp/WEB-INF/views/admin_bid.jsp
	modified:   src/main/webapp/WEB-INF/views/admin_product.jsp
	modified:   src/main/webapp/WEB-INF/views/product_list.jsp
	modified:   src/main/webapp/WEB-INF/views/resources/css/admin.css
	modified:   src/main/webapp/WEB-INF/views/resources/css/product.css
	new file:   src/main/webapp/WEB-INF/views/resources/css/simplePagination.css
	modified:   src/main/webapp/WEB-INF/views/resources/img/bid.png
	new file:   src/main/webapp/WEB-INF/views/resources/img/home-background-dark.png
	new file:   src/main/webapp/WEB-INF/views/resources/img/home-background.png
	new file:   src/main/webapp/WEB-INF/views/resources/img/product_background.jpg
	modified:   src/main/webapp/WEB-INF/views/resources/js/admin_product.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/bid.js
	new file:   src/main/webapp/WEB-INF/views/resources/js/lib/jquery.simplePagination.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/product.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/vteam.js