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/hibernate/dao/ProductDAO.java
	modified:   src/main/java/com/vteam/xml_project/service/ProductService.java
	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/product.css
	new file:   src/main/webapp/WEB-INF/views/resources/img/loading.gif
	modified:   src/main/webapp/WEB-INF/views/resources/js/admin_product.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/category.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/product.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/vteam.js

	modified:   src/main/webapp/WEB-INF/views/product_list.jsp