add admin.jsp page updated Delete
Merge branch 'master' of https://github.com/tinhnghiahoi/projectEJB

Conflicts:
	DVDStore/web/WEB-INF/view/admin.jsp
Merge branch 'master' of https://github.com/tinhnghiahoi/projectEJB