various changes
fixing a couple merge conflicts
small changes
Merge branch 'attributeMatrix' of https://github.com/dream3d/DREAM3D into attributeMatrix
Merge branch 'attributeMatrix' of https://github.com/dream3d/DREAM3D into attributeMatrix
small changes in sine segmentation
Merge branch 'attributeMatrix' of https://github.com/dream3d/DREAM3D into attributeMatrix