cursor completed
Merge branch 'master' into irene

Conflicts:
	canvas.cpp
	item.cpp
	mainwindow.cpp