Putting together SOLR iterator
Merge branch 'master' of https://github.com/KolonelKustard/discodj.git

Conflicts:
	discodj-solr/src/main/java/com/totalchange/discodj/search/solr/SolrCatalogueEntityIterator.java