dati climatici
merge porchetta

Conflicts:
	src/main/resources/it/cnr/to/geoclimalp/dbalps/resources/string.properties
	src/main/resources/it/cnr/to/geoclimalp/dbalps/resources/string_en_US.properties
	src/main/resources/it/cnr/to/geoclimalp/dbalps/resources/string_it_IT.properties