Merge remote-tracking branch 'origin/master'

Conflicts:
	recursos/css/estilo.css
Merge remote-tracking branch 'origin/master'