More data annotations
Merge branch 'master' of https://github.com/KTH-haninge-project/community