Added 2 more neighborhood types and included resulting shape types in combobox
Merge branch 'attributeMatrix' of https://github.com/dream3d/dream3d into attributeMatrix