Merge remote-tracking branch 'upstream/develop' into RoiInCore

CHANGELOG

CMakeLists.txt

Core/Aggregate/FormFactorWrapper.cpp

Core/Aggregate/FormFactorWrapper.h

Core/Aggregate/ILayout.h

Core/Aggregate/ParticleLayout.cpp

Core/Aggregate/ParticleLayout.h

Core/Binning/SimulationElement.h

Core/CMakeLists.txt

Core/Computation/DecoratedLayerComputation.cpp

Core/Computation/DecoratedLayerComputation.h

Core/Computation/InnerCounter.cpp

Core/Computation/InnerCounter.h

Core/Computation/MainComputation.cpp

Core/Computation/RoughMultiLayerComputation.cpp

Core/Computation/RoughMultiLayerComputation.h

Core/Multilayer/DecouplingApproximationStrategy.cpp

Core/Multilayer/DecouplingApproximationStrategy.h

Core/Multilayer/IInterferenceFunctionStrategy.cpp

Core/Multilayer/IInterferenceFunctionStrategy.h