make changes on git flow and and two more standards for code style
Merge branch 'change'

* change:
  make changes on git flow and and two more standards for code style