Merge branch 'master' into alias1-196-disable-agents
Conflicts:
app/assets/stylesheets/application.css.scss.erb
app/views/agents/_form.html.erb
app/views/agents/index.html.erb
app/views/agents/show.html.erb
app/views/events/index.html.erb
Andrew Cantino
лет %!s(int64=11): %!d(string=назад)