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

Core/Aggregate/FormFactorCoherentPart.cpp

Core/Aggregate/ILayout.h

Core/Aggregate/ParticleLayout.cpp

Core/Aggregate/ParticleLayout.h

Core/Computation/IComputationTerm.cpp

Core/Computation/IComputationTerm.h

Core/Computation/MainComputation.cpp

Core/Computation/MainComputation.h

Core/Computation/ParticleLayoutComputation.cpp

Core/Computation/ParticleLayoutComputation.h

Core/Computation/RoughMultiLayerComputation.cpp

Core/Computation/RoughMultiLayerComputation.h

Core/Computation/Slice.h

Core/Computation/SpecularComputation.cpp

Core/Computation/SpecularComputation.h

Core/DecoratedFormFactor/FormFactorDecoratorMaterial.cpp

Core/DecoratedFormFactor/FormFactorDecoratorMaterial.h

Core/DecoratedFormFactor/IFormFactorDecorator.h

Core/Export/ExportToPython.cpp

Core/Export/SampleLabelHandler.cpp