Prepare OwnMarkerRenderSetup to return last activity when exits (and no
return to main menu like before)
Merge branch 'master' of git@gitlab.com:cowabunga-team/ar-cowabunga-project.git