Merge pull request #952 from jwuttke/integrator

Core/Aggregate/FTDistributions2D.cpp

Core/Aggregate/FTDistributions2D.h

Core/Aggregate/IPeakShape.cpp

Core/Aggregate/IPeakShape.h

Core/Aggregate/InterferenceFunction2DLattice.cpp

Core/Aggregate/InterferenceFunction2DLattice.h

Core/Aggregate/InterferenceFunction2DParaCrystal.cpp

Core/Aggregate/InterferenceFunction2DParaCrystal.h

Core/Aggregate/InterferenceFunction2DSuperLattice.cpp

Core/Aggregate/InterferenceFunction2DSuperLattice.h

Core/Aggregate/InterferenceFunctionFinite2DLattice.cpp

Core/Aggregate/InterferenceFunctionFinite2DLattice.h

Core/Aggregate/InterferenceFunctionHardDisk.cpp

Core/Aggregate/InterferenceFunctionHardDisk.h

Core/CMakeLists.txt

Core/HardParticle/FormFactorCone.cpp

Core/HardParticle/FormFactorCone.h

Core/HardParticle/FormFactorDot.cpp

Core/HardParticle/FormFactorDot.h

Core/HardParticle/FormFactorFullSpheroid.cpp