Starting implementation of the QFilterParametersWriter for the DataContainerArrayProxy class.
Fixing merge Conflict

Conflicts:
	Source/DREAM3DLib/IOFilters/DataContainerReader.cpp