More progress
Merge remote-tracking branch 'origin/master'

Conflicts:
	Cadexquis.dpf
	Cadexquis.pro
	Views/main.qml
Correct merge