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/dto/BidListDTO.java
	new file:   src/main/java/com/vteam/xml_project/dto/NinCodeDTO.java
	new file:   src/main/java/com/vteam/xml_project/dto/NinCodeListDTO.java
	modified:   src/main/java/com/vteam/xml_project/dto/ProductDTO.java
	modified:   src/main/java/com/vteam/xml_project/hibernate/dao/BaseDAO.java
	modified:   src/main/java/com/vteam/xml_project/hibernate/dao/BidDAO.java
	new file:   src/main/java/com/vteam/xml_project/hibernate/dao/CardCodeDAO.java
	modified:   src/main/java/com/vteam/xml_project/hibernate/dao/ProductDAO.java
	modified:   src/main/java/com/vteam/xml_project/hibernate/orm/Bids.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/BidService.java
	modified:   src/main/java/com/vteam/xml_project/service/ProductService.java
	modified:   src/main/java/com/vteam/xml_project/util/StringUtil.java
	modified:   src/main/webapp/WEB-INF/views/admin.jsp
	modified:   src/main/webapp/WEB-INF/views/admin_bid.jsp
	modified:   src/main/webapp/WEB-INF/views/product_list.jsp
	new file:   src/main/webapp/WEB-INF/views/resources/img/product/Nokia 1280-2.jpg
	new file:   src/main/webapp/WEB-INF/views/resources/img/product/Pantech-A630K-sky.jpg
	new file:   src/main/webapp/WEB-INF/views/resources/img/product/blackberry-10.jpg
	new file:   src/main/webapp/WEB-INF/views/resources/img/product/canon-550d.jpg
	new file:   src/main/webapp/WEB-INF/views/resources/img/product/motit1_motorola.jpg
	new file:   src/main/webapp/WEB-INF/views/resources/img/product/nokia-lumia-920-yellow-front.jpg
	new file:   src/main/webapp/WEB-INF/views/resources/img/product/samsung-galaxy-note-2.jpg
	new file:   src/main/webapp/WEB-INF/views/resources/img/product/somi-anphuoc.gif
	new file:   src/main/webapp/WEB-INF/views/resources/img/product/vans-mens.jpg
	new file:   src/main/webapp/WEB-INF/views/resources/img/product/x1-01.jpg
	new file:   src/main/webapp/WEB-INF/views/resources/img/product/xperia-z-black.jpg
	new file:   src/main/webapp/WEB-INF/views/resources/js/admin.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/bid.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/product.js