1
Merge branch 'develop' of https://github.com/Efrimer/VectorDraw into develop

Conflicts:
	mainwindow.ui
	whiteboard.h