Corrige o filtro de geonames
Merge remote-tracking branch 'origin/models' into models

Conflicts:
	ecofunds/crud/admin.py