first commit
manual mergefix
Merge branch 'master' of https://github.com/NatLibFi/Skosmos