Merge branch 'hotfix/fix_make_up_2'

* hotfix/fix_make_up_2:
  fix something
  fix blog posts on main page
Merge branch 'release/1.7.4'

* release/1.7.4:
  fix news_controller
add event_report
add types!
fix admin users
some fixes in admin
add buttons to participant welcome
add functional for participant report
add admin reports
fix tests
add admin reports functional
add results to report
add text about docuemts
add participants
add admin participant functional
add participant other vew
add photos
Merge branch 'feature/event_reports' into develop

* feature/event_reports:
  add photos
  add participant other vew
  add admin participant functional
  add participants
  add text about docuemts
  add results to report
  add admin reports functional
  fix tests
  add admin reports
  add functional for participant report
  add buttons to participant welcome
  some fixes in admin
  fix admin users
  add types!
  add event_report
news count changed
Merge branch 'hotfix/edit_news_count' into develop

* hotfix/edit_news_count:
  news count changed