format code
Merge branch 'master' of https://github.com/tinhnghiahoi/projectEJB

Conflicts:
	DVDStore/src/java/controller/ControllerServlet.java
edit table's name
search
db
abc