added gitflow
Merge branch 'release/1.0b2'

* release/1.0b2:
  added gitflow