add merge command line tool
Merge branch 'master' of github.com:qcad/qcad
clean up