Merge branch 'hotfix/redirect_from_edit_news'

* hotfix/redirect_from_edit_news:
  redirect to news/show
Update competition.html.haml
upload folder changed to /system
Merge branch 'hotfix/upload_folder' into develop
Merge branch 'develop' of https://github.com/ulmic/i_am_the_lider into develop