Merge remote-tracking branch 'origin/master'

Conflicts:
	views/publicados/det_anuncio.php
	views/publicados/listados.php