solr query string
Merge branch 'master' of
https://github.com/socialsensor/socialsensor-framework-common.git

Conflicts:
	src/main/java/eu/socialsensor/framework/common/domain/dysco/Dysco.java