product admin ver1.0
Merge branch 'develop' of https://github.com/rubikill/JavaPhanTan into develop

Conflicts:
	JavaDACK/src/main/java/co/hcmus/daos/IPromotionDetailDAO.java
	JavaDACK/src/main/java/co/hcmus/services/IPromotionDetailService.java
	JavaDACK/src/main/webapp/WEB-INF/layout/script.jsp