Merge branch 'organisation-fixes' of github.com:dr0i/lodmill into organisation-fixes

Conflicts:
	lodmill-rd/src/test/java/org/lobid/lodmill/LobidOrganisationsUpdateTest.java
	lodmill-rd/src/test/resources/zdb2lobidOrganisations.flux
Merge branch 'organisation-fixes' of github.com:dr0i/lodmill into organisation-fixes

Conflicts:
	lodmill-rd/src/test/resources/zdb2lobidOrganisations.flux