added git-flow package
Merge branch 'release/git-flow'