cambios en filtros

filtros
Merge branch 'master' of https://github.com/Chirimoyo/MapTest

Conflicts:
	MapTest/Busqueda.h
	MapTest/VistaMapaViewController.m