Merge branch 'develop' into trythings

App/App.pro

App/inc/App.h

App/inc/AppLinkDef.h

App/inc/CommandLine.h

App/inc/DrawHelper.h

App/inc/FunctionalTestFactory.h

App/src/AppOptionsDescription.cpp

App/src/CommandLine.cpp

App/src/DrawHelper.cpp

App/src/FunctionalTestFactory.cpp

App/src/IsGISAXSTools.cpp

App/src/StandardSamples.cpp

App/src/TestConvolution.cpp

App/src/TestDetectorResolution.cpp

App/src/TestDiffuseReflection.cpp

App/src/TestFittingModule1.cpp

App/src/TestFittingModule2.cpp

App/src/TestFittingModule3.cpp

App/src/TestFormFactors.cpp

App/src/TestFresnelCoeff.cpp