Merge branch 'release/add_import_person_fix_event_logic' into develop
Merge branch 'master' of github.com:bigbag/term-flask into develop
Merge branch 'hotfix/fix_events_list_view' into develop
feature Оповещения о сбое на email
feature Таск по рассылке оповещений о сбое добавлен в задачи для celery, запускается раз в 10 мин
Merge branch 'feature/term_alarm' into develop
Merge branch 'develop' of https://github.com/bigbag/term-flask into develop

Conflicts:
	web/static/term/angular/term/controllers/terminal.js
Merge branch 'master' of github.com:bigbag/term-flask into develop
fix: person import utf8
fix: term alarm form
fix: report bags
fix: term alarms form
Merge branch 'release/check_term_alarm'