Work on TA859/TA860
Merge branch 'master' of https://github.com/Det-Kongelige-Bibliotek/Yggdrasil

Conflicts:
	.classpath
	.project
	pom.xml