added git-workflow.txt
Merge branch 'master' into devel
Resume development only on 'devel' branch
bug fixes through #45