Merge remote-tracking branch 'origin/master' into develop
Merge branch 'develop' of github.com:bigbag/term-flask into develop
Merge branch 'hotfix/replace_time_format' into develop
Merge branch 'hotfix/fix_soc_config' into develop
Merge branch 'master' of github.com:bigbag/term-flask into develop
Merge branch 'hotfix/fix_templates' into develop
Merge branch 'hotfix/add_term_factor_edit_form' into develop
Merge branch 'hotfix/fix_bags_in_term_fsctor_form' into develop
Merge branch 'hotfix/fix_admin_api' into develop
Merge branch 'hotfix/fix_api_admin_and_api_test' into develop
Merge branch 'hotfix/fix_view_person' into develop
Merge branch 'hotfix/fix_admin_api_auth' into develop
Merge branch 'hotfix/fix_report_interface' into develop
Merge branch 'hotfix/fix_default_redict' into develop
Merge branch 'hotfix/barcodes' into develop

Conflicts:
	models/spot.py
feature функция api, возвращающая акции, в которых участвует спот по EAN
fix: added general url constant
refactor: models
fix: report stack model
fix: added forms for report stask