resolve #236, resolve #237: git hack/extract - error if branch exists remotely
Merge branch 'master' into aw-finish-config