tags admin function
Merge branch 'master' of https://github.com/hunterbmt/xml_project

Conflicts:
	src/main/webapp/WEB-INF/views/resources/js/admin_product.js

	modified:   pom.xml
	modified:   src/main/java/com/vteam/xml_project/api/CategoryAPI.java