Playing with changing how catalogue lists all its entries
Merge branch 'master' of https://github.com/KolonelKustard/discodj.git

Conflicts:
	discodj-xuggler/src/main/java/com/totalchange/discodj/xuggler/XugglerCatalogueEntityIterator.java