marker handler in a separate file
active handler edit on click
Merge branch 'master' into touchSupport