sdf
Removed .orig files
sdf
Mersdfge branch 'master' into testing

Conflicts:
	src/core/graphicsscene.cpp
	src/core/graphicsscene.h
	src/core/graphicsview.cpp
added graphicsitemgrid.cpp and .h