resolve conflict on ControllerServlet
Merge branch 'master' of https://github.com/tinhnghiahoi/projectEJB
add dvd's summary