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

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

	modified:   pom.xml
	modified:   src/main/java/com/vteam/xml_project/api/BidAPI.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/UserAPI.java
	modified:   src/main/java/com/vteam/xml_project/context/listener/ApplicationListenerBean.java
	modified:   src/main/java/com/vteam/xml_project/dto/BidDTO.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/dto/UserDTO.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/service/AdminService.java
	modified:   src/main/java/com/vteam/xml_project/service/BidHistoryService.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/ProductService.java
	modified:   src/main/java/com/vteam/xml_project/service/UserService.java
	modified:   src/main/java/com/vteam/xml_project/util/PhoneNumberUtil.java
	modified:   src/main/java/com/vteam/xml_project/util/XMLUtil.java
	modified:   src/main/webapp/WEB-INF/views/admin_bid.jsp
	modified:   src/main/webapp/WEB-INF/views/product_list.jsp
	modified:   src/main/webapp/WEB-INF/views/resources/js/bid.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/dateUtils.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/login.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/vteam.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/xml_transform_helper.js
	modified:   src/main/webapp/WEB-INF/views/resources/xml/main_page_menu.xml
	new file:   src/main/webapp/WEB-INF/views/resources/xsl/HotBidProductIDs.xsl
	new file:   src/main/webapp/WEB-INF/views/resources/xsl/HotBidProducts.xsl
	deleted:    src/main/webapp/WEB-INF/views/resources/xsl/UpcomingBidPaging.xsl
	modified:   src/main/webapp/WEB-INF/views/resources/xsl/ongoingBid_list.xsl
	new file:   src/main/webapp/WEB-INF/views/resources/xsl/order_history.xsl
	modified:   src/main/webapp/WEB-INF/views/resources/xsl/order_history_pdf.xsl
	modified:   src/main/webapp/WEB-INF/views/resources/xsl/product.xsl
	new file:   src/main/webapp/WEB-INF/views/resources/xsl/user_output.xml
bla bla