busqueda
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/propiedads_controller.rb
	app/views/propiedads/buscar_propiedad.html.erb