new implementation for editing existing map markers
Merge remote-tracking branch 'origin/master'