resolve #236, resolve #237: git hack/extract - error if branch exists remotely
Merge branch 'master' into kg-user-stories-hack

Conflicts:
	features/git-hack/branch_exists_locally_with_open_changes.feature
	features/git-hack/branch_exists_locally_without_open_changes.feature