Merge pull request #2 from nicolasheraly/develop

fix routing/ zfcuser / mapping / add intervention / finish marker map