update

atest
Merge branch 'master' of https://github.com/efuste/Efust004

Conflicts:
	web/myMovies/confirm.jsp
update confirm

fix conflict