update
Merge branch 'master' of github.com:qcad/qcad

Conflicts:
	scripts/Draw/Ellipse/EllipseInscribedQuad/ts/EllipseInscribedQuad_ja.ts