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

Conflicts:
	scripts/Edit/DrawingPreferences/DimensionSettings/DimensionSettings.js