upgraded to OpenEntity API 0.25.0-SNAPSHOT
did some mess
Merge origin/master, adapting to openentity 0.25.0

Conflicts:
	src/main/java/eu/trentorise/opendata/disiclient/model/entity/EntityODR.java
	src/test/java/eu/trentorise/opendata/disiclient/test/services/TestEntityService.java
merged
Merge origin/master

Conflicts:
	src/test/java/eu/trentorise/opendata/disiclient/test/services/TestEntityService.java