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: