Merge branch 'develop' into ellipseshape

Conflicts:
	Shape.h
Adapted ellipse code to latest changes (Point -> QPointF).
Fixed small error in the way color ellipses were drawn (wrong coordinates).
Ellipse overrides setVertex() in order to limit placement of vertices correctly.
Draws ellipse control points in a better, uniform way.
Merge branch 'ellipseshape' of github.com:libremapping/libremapping into ellipseshape

Conflicts:
	Shape.h