Alteração na menssagem de erro 
Inclusão do servlet de logout
Merge branch 'master' of https://github.com/iwasse/movinfx.git

Conflicts:
	src/main/webapp/filme1.html
	src/main/webapp/index.jsp
teste
Merge branch 'master' of https://github.com/iwasse/movinfx.git

Conflicts:
	src/main/webapp/index.jsp