Merge remote-tracking branch 'origin/em'
instant eraser feature completion.
Merge branch 'em'

Conflicts:
	src/interface/scribblearea.cpp