Change note type mapping.
Merge branch 'cahytinne-master'
Add broader to collections
Merge remote-tracking branch 'upstream/master'
Latest skosprovider adjustments are required