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/api/BidAPI.java
	modified:   src/main/java/com/vteam/xml_project/api/CategoryAPI.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/TagsAPI.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/controller/AdminController.java
	modified:   src/main/java/com/vteam/xml_project/controller/MainController.java
	modified:   src/main/java/com/vteam/xml_project/controller/UserSession.java
	modified:   src/main/java/com/vteam/xml_project/dto/BidDTO.java
	modified:   src/main/java/com/vteam/xml_project/dto/BidListDTO.java
	modified:   src/main/java/com/vteam/xml_project/dto/NinCodeDTO.java
	modified:   src/main/java/com/vteam/xml_project/dto/NinCodeListDTO.java
	modified:   src/main/java/com/vteam/xml_project/hibernate/dao/BidHistoryDAO.java
	modified:   src/main/java/com/vteam/xml_project/hibernate/dao/CardCodeDAO.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/dao/SearchCacheDAO.java
	modified:   src/main/java/com/vteam/xml_project/hibernate/dao/UserDAO.java
	modified:   src/main/java/com/vteam/xml_project/hibernate/dao/UserPaymentDAO.java
	modified:   src/main/java/com/vteam/xml_project/hibernate/orm/Bids.java
	modified:   src/main/java/com/vteam/xml_project/hibernate/orm/SearchCache.java
	modified:   src/main/java/com/vteam/xml_project/hibernate/orm/Users.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/ProductService.java
	modified:   src/main/java/com/vteam/xml_project/service/UserService.java
	modified:   src/main/java/com/vteam/xml_project/util/XMLUtil.java
	modified:   src/main/java/test.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/resources/js/bid.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/product.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/search.js
	new file:   src/main/webapp/WEB-INF/views/resources/xsl/nin_code_pdf.xsl
	new file:   src/main/webapp/WEB-INF/views/resources/xsl/product.xsl