UHCore subtree merged into accompany
Merge branch 'master' of https://github.com/uh-nmb/accompany