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