start payment
start payment2
Merge branch 'hotfix/1.5.1' into develop
Merge branch 'feature/payment' into develop
Merge branch 'hotfix/fixCateLogin' into develop
Merge branch 'hotfix/1.5.2' into develop
developing
Merge branch 'hotfix/1.5.3' into develop
finish samsung api
Merge branch 'feature/changeFlowSamsungAPI' into develop
Merge branch 'release/1.6.0'