Merge branch 'develop-CDORemap_method' into 'master'

Include 'laf', 'con2', 'nn' methods in CDORemap

See merge request !80
1 job for master
in 6 minutes and 19 seconds, using 0 compute credits, and was queued for 3 seconds