?
Merge branch 'master' of
https://github.com/GiulioGx/DistributedSystemsProject.git

Conflicts:
	OntoStar/bin/solr/SolrQueryMaker.class