Merge branch 'hotfix/fix_admin2' into develop

* hotfix/fix_admin2:
  fix controller
Merge branch 'develop' of github.com:ulmic/i_am_the_lider into develop

* 'develop' of github.com:ulmic/i_am_the_lider:
Merge branch 'hotfix/fix_events_update' into develop

* hotfix/fix_events_update:
  fixed
Merge branch 'hotfix/fix_make_up_2' into develop

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

* release/1.7.4:
  fix news_controller