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

Conflicts:
	src/main/webapp/WEB-INF/views/resources/css/entypo.css
	src/main/webapp/WEB-INF/views/resources/js/product.js

	modified:   src/main/java/com/vteam/xml_project/hibernate/dao/ProductDAO.java
	new file:   src/main/java/com/vteam/xml_project/hibernate/dao/UserPaymentDAO.java
	modified:   src/main/java/com/vteam/xml_project/service/UserService.java
	modified:   src/main/webapp/WEB-INF/views/product_list.jsp
	modified:   src/main/webapp/WEB-INF/views/resources/css/entypo.css
	modified:   src/main/webapp/WEB-INF/views/resources/css/product.css
	new file:   src/main/webapp/WEB-INF/views/resources/img/bg_noise-5.png
	new file:   src/main/webapp/WEB-INF/views/resources/img/on-bid.png
	new file:   src/main/webapp/WEB-INF/views/resources/img/upcoming-bid.png
	modified:   src/main/webapp/WEB-INF/views/resources/js/bid.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/category.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/login.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/order.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/product.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/vteam.js