Merge branch 'hotfix/fix_background_payment' into develop
Merge branch 'hotfix/add_delete_fail_payment' into develop
Merge branch 'hotfix/fixed_bug_in_fail_payment' into develop
Merge branch 'hotfix/move_payment_algorithm_in_config' into develop
Merge branch 'develop' of github.com:bigbag/term-flask into develop
Merge branch 'hotfix/move_celery_config_in_general_config' into develop
Merge branch 'hotfix/fix_blacklist_in_term_api' into develop
Merge branch 'hotfix/edit_blacklist_condition' into develop
Merge branch 'hotfix/add_blacklist_settings' into develop
Merge branch 'hotfix/fix_code_style' into develop
Merge branch 'hotfix/fix_empty_field_in_report' into develop
Merge branch 'hotfix/fix_term_firm_model' into develop
Merge branch 'hotfix/fixed_tasks_list' into develop
Merge branch 'hotfix/fixed_import_person' into develop
Merge branch 'hotfix/vk_like' into develop
Merge branch 'hotfix/vk_like_2' into develop
Merge branch 'hotfix/add_wercker_support' into develop
Refactoring logging
Merge branch 'develop' of github.com:bigbag/term-flask into develop
fix