update edit
Merge branch 'master' of https://github.com/tinhnghiahoi/projectEJB

Conflicts:
	DVDStore/src/java/session/CommandeFacade.java