cleanup
fix menu order
Merge branch 'master' of github.com:qcad/qcad