edit competititon
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