Fixed a few merge issues
Merge branch 'feature/ReadInDREAM3DFile' of ssh://scm.bluequartz.net/DREAM3D into feature/ReadInDREAM3DFile

Conflicts:
	Source/DREAM3DLib/Common/TextFilterParametersWriter.h
	Source/DREAM3DLib/HDF5/H5FilterParametersWriter.cpp
Changed TestFilter class name to GenericFilter, and fixed some compile errors
Added IntVec3Widget_t and FloatVec3Widget_t tests to the FilterParametersRWTest
Starting implementation of Writing Array Selections
Fixing extra line ending
Adding some more API to AbstractFilterParameterWriter
Added ArraySelectionWidget tests to FilterParametersRW test
Fixing some errors and adding #error comments for Joey K. to fix or refactor.
Adding a file to store string constants for the HDF5 Filter Parameters reading and writing.
Starting code for the FilterManger and FilterFactory classes that will allow DREAM3D to read a pipeline from a file and instantiate the filters. This code is not ready and will not currently compile.
Adding missing files from last commit
Finished changing around the file dataset and attribute structures.  However, the file does not write any more.
Fixing a few compilation errors
Merge branch 'master' into feature/ReadInDREAM3DFile

# By Michael Jackson (29) and others
# Via Michael Jackson (6) and Michael Groeber (1)
* master: (38 commits)
  Removing debug output
  Added warnings to the Generate Ensemble Statistics filter when the correct distributions are not selected by the user.
  Adding Prebuilt Pipeline for generating Statistics for use as an input into the synthetic microstructure generation
  updating with bug fix notes
  fixing bug in MXAFileInfor where we ended up with infinite recursion due to passing in an empty string into the 'filename' method.
  Fixing output values so XYZ start at 1 instead of Zero
  Adding a writer to output a file that can be used as an input into the Ricardo Lebensohn's 3D Simulation FFT codes at Los Alamos National Lab.
  Setting Version Number
  Updating ToDo list with items from CMU Workshop feed back
  Fixing messed up pipelines
  updating gbcd to use doubles instead of float
  Adding more bug reports and things to fix based on feedback from CMU Workshop
  Disabling some actions while pipeline is running
  Fixing Tabbing order of Primary Phase Widget in StatsGenerator
  Fixing bug where we were walking off the end of an array because we have incremented an index past the max number of color names that Qt has.
  Directories and files are now being added to the prebuilts list using the new recursive algorithm.
  Removing Conversion from Radian to Euler on the Read. We should really have a check box for this.
  The directories are now created recursively, but the pipeline items are not.
  Adding bug report.
  Continued work on recursive algorithm
  ...

Conflicts:
	.gitignore
	Source/DREAM3DLib/StatisticsFilters/FindTwinBoundaries.cpp
Merge branch 'feature/ReadInDREAM3DFile' of ssh://scm.bluequartz.net/DREAM3D into feature/ReadInDREAM3DFile

# By Joey Kleingers
# Via Joey Kleingers
* 'feature/ReadInDREAM3DFile' of ssh://scm.bluequartz.net/DREAM3D:
  Fixing a few compilation errors
  Finished changing around the file dataset and attribute structures.  However, the file does not write any more.
Adding new methods for Factory DREAM3D filters, updating the PluginMaker app to produce correct projects. updating existing plugins to new standard.
Updating code to look specifically for .ini or .txt
Changing API to require an index and return a possibly new index into the pipeline
Cleaning code