Merge branch 'master' of
https://github.com/germansturtz/ClienteServidor.git

Conflicts:
	cinemania/src/main/webapp/WEB-INF/views/index.jsp
Merge branch 'master' of
https://github.com/germansturtz/ClienteServidor.git