small changes
Merge branch 'attributeMatrix' of ssh://github.com/dream3d/DREAM3D into attributeMatrix
adding a missing file to the cmake list
fixing merge issue
fixing the numNeighbors writing from the neighborList class
fixing merge issue