Crosshair cursor for drawing mode
Merge branch 'master' into gh-pages