Merge branch 'issue-25' into 'develop-v2.1.1'

closes #25: define taxonomies of vehicles and vulnerable road users instead of hierarchies

Closes #25

See merge request !16