Merge branch 'hotfix/fix_report_interface_4' into develop
Merge branch 'master' of github.com:bigbag/term-flask into develop
Merge branch 'hotfix/fix_rent_bags' into develop
feature Различные события для вендинговых и POS терминалов
Merge branch 'develop' of https://github.com/bigbag/term-flask into develop
Merge branch 'hotfix/report_sender_stage3' into develop
Merge branch 'develop' of github.com:bigbag/term-flask into develop
Merge branch 'master' of github.com:bigbag/term-flask into develop
Merge branch 'hotfix/report_sender_stage4' into develop
Merge branch 'hotfix/fix_parser_lost_payment' into develop
Merge branch 'hotfix/fix_report_parser' into develop
Merge branch 'hotfix/report_sender_stage5' into develop
Merge branch 'hotfix/report_sender_stage6' into develop
Merge branch 'hotfix/fix_bags_in_report_sender' into develop
feature Импорт сотрудников из *.xls
Merge branch 'develop' of https://github.com/bigbag/term-flask into develop

Conflicts:
	web/templates/term/layout.html
	web/templates/term/person/index.html
merge develop with origin/develop
fix проверки формата при импорте сотрудников
fix защита от передачи нестроковых данных при импорте сотрудников
Merge branch 'hotfix/add_person_corp_reports' into develop