add myfeature
Merge branch 'myfeature' into develop

* myfeature:
  add myfeature
add release file
Merge branch 'release-1.2'

* release-1.2:
  add release file
  add myfeature
hotfix
Merge branch 'hotfix-1.2.1'

* hotfix-1.2.1:
  hotfix