Merge branch 'hotfix/v1.0' into develop
init payment
Merge branch 'release/payment'