Editor: Ignore markerClicks when Marker tool is selected on editor

Fixes #952 by using the solution given on http://stackoverflow.com/a/19491272/2577890