Merge branch 'master' of https://github.com/JanThorbecke/OpenSource

fdacrtmc/extractMigrationSnapshots.c

fdacrtmc/rtmImagingCondition.c

marchenko/Makefile

marchenko/demo/oneD/primaries.scr

marchenko/marchenko_primaries.c

marchenko/synthesis.c

marchenko3D/Makefile

marchenko3D/TWtransform.c

marchenko3D/getFileInfo3DW.c

marchenko3D/marchenko3D.c

marchenko3D/readShotData3D.c

raytime3d/getParameters3d.c

raytime3d/raytime3d.h

raytime3d/recvPar3D.c

utils/combine.c

utils/mutesnap.c

utils/syn2d.c