Merge branch 'hotfix/fix_event_admin_show'

* hotfix/fix_event_admin_show:
  fixed
fix controller
Merge branch 'hotfix/fix_admin2' into develop

* hotfix/fix_admin2:
  fix controller