Merge branch 'master' of git.jcns.frm2:GISASFW

App/App.pro

App/inc/TestIsGISAXS1.h

App/inc/TestIsGISAXS10.h

App/src/TestFactory.cpp

App/src/TestIsGISAXS1.cpp

App/src/TestIsGISAXS10.cpp

App/src/TestIsGISAXS3.cpp

Core/Algorithms/inc/DecouplingApproximationStrategy.h

Core/Algorithms/inc/FormFactorSLDDecorator.h

Core/Algorithms/inc/IInterferenceFunctionStrategy.h

Core/Algorithms/inc/LocalMonodisperseApproximationStrategy.h

Core/Algorithms/src/DecouplingApproximationStrategy.cpp

Core/Algorithms/src/LayerDecoratorDWBASimulation.cpp

...Algorithms/src/LocalMonodisperseApproximationStrategy.cpp

Core/Core.pro

Core/Samples/inc/NanoParticleDecoration.h

Core/Samples/src/NanoParticleDecoration.cpp

Doc/UML/model.di

Doc/UML/model.notation

Doc/UML/model.uml