working on the gui
fixing merge error
small change
fixing merge issues
Merge branch 'attributeMatrix' of https://github.com/dream3d/DREAM3D into attributeMatrix