Small changes to update some codes.
Merge branch 'DCRedefine' of https://github.com/dream3d/DREAM3D into DCRedefine
Fixing compile errors due to bad merge.