Merge branch 'issue-33' into 'issue-32'

closes #33: defines Parking Spot as feature kind with narrower kinds

See merge request !26