Merge origin/master

Conflicts:
	src/main/java/eu/trentorise/opendata/disiclient/services/KnowledgeService.java
	src/main/java/eu/trentorise/opendata/disiclient/services/model/SearchResult.java
	src/test/java/eu/trentorise/opendata/disiclient/test/services/TestKnowledgeService.java
versioned netbeans config files