Merge branch 'hotfix/vxx' into develop
Merge branch 'hotfix/fixmetrics' into develop
Merge branch 'hotfix/edit_competition' into develop

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

* 'develop' of github.com:ulmic/i_am_the_lider:
  change html to html.erb for metrics
  fix metrix: js to html
Merge branch 'hotfix/edit_districts' into develop

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

* hotfix/edit_seed:
  edit seeds
Merge branch 'hotfix/add_video_to_main_page' into develop

* hotfix/add_video_to_main_page:
  add video to main page
fix size of video
Merge branch 'develop'

* develop:
  fix size of video