copia de Servidor
Merge branch 'master' of https://github.com/ve-media/anuncios

Conflicts:
	css/estilo.css
	images/favicon.ico
	index.php
	js/jquery.loading-indicator.js
	js/main.js
	upload/upl04d1f1v3.php
	views/pubanuncio/frmprocanun.php
	views/pubanuncio/frmreganun.php