Merge branch 'hotfix/add_wercker_support'
Merge branch 'hotfix/fix_term_upload_dir'
Merge branch 'master' of github.com:bigbag/term-flask
Merge branch 'release/refactor_logging'
fix
Merge branch 'hotfix/add_debug_info_in_payment_task' into develop