Merge branch 'hotfix/0.1.6'
Remove payment method model
Merge branch 'hotfix/0.1.7'
Merge branch 'hotfix/0.1.8' into develop