Merge branch 'master' into mzk

Conflicts:
	import-mets/src/main/java/org/kramerius/importmets/convertor/BaseConvertor.java