cambios brutales en cartelera
Merge remote-tracking branch 'origin/master' into Christian

Conflicts:
	src/main/webapp/pages/header.jsp
	src/main/webapp/resources/css/style.css