Changes to allow VS2013 to compile the code
Merge branch 'master' of https://github.com/dream3d/DREAM3D