Desarrollo de Maps Avisos
Merge remote-tracking branch 'origin/master'

Conflicts:
	plantilla/sidebar.php