https://github.com/imeji-community/imeji/issues/530
Merge remote-tracking branch 'origin/develop' into zusearchive

Conflicts:
	src/main/java/de/mpg/imeji/presentation/metadata/SuperMetadataTree.java