Filtro de idioma para las estaciones de transporte
Merge branch 'master' of github.com:Emergya/geoservices-search into solar_allPOIs

Conflicts:
	geoservices-search-pois-solr-config/conf/dataimport.properties
Merged changes from upstream.
Asociación de POIs con capas de SICECAT
Merge branch 'solar_allPOIs' of github.com:adrianagm/geoservices-search into adrianagm-solar_allPOIs

Conflicts:
	geoservices-search-pois-solr-config/conf/dataimport.properties
Merge branch 'adrianagm-solar_allPOIs'