fix
Merge branch 'hotfix/move_payment_algorithm_in_config'
Merge branch 'master' of github.com:bigbag/term-flask