Changes
Merge branch 'master' of https://github.com/his-interop/openinfoman-zim

merged
Changes Working
Merge branch 'master' of https://github.com/his-interop/openinfoman-zim

mERGED