Merge branch 'hotfix/fixmetrics'
Merge branch 'hotfix/edit_competition'

* hotfix/edit_competition:
  edit competititon
Merge branch 'master' of github.com:ulmic/i_am_the_lider

* 'master' of github.com:ulmic/i_am_the_lider:
  change html to html.erb for metrics
  fix metrix: js to html
edit 'Ь' to ТеренЬгульский район in distrcits
Merge branch 'hotfix/edit_districts'

* hotfix/edit_districts:
  edit 'Ь' to ТеренЬгульский район in distrcits
Merge branch 'hotfix/edit_districts' into develop

* hotfix/edit_districts:
  edit 'Ь' to ТеренЬгульский район in distrcits
edit seeds
Merge branch 'hotfix/edit_seed' into develop

* hotfix/edit_seed:
  edit seeds