Merge branch 'hotfix/fix_api_controler' into develop

* hotfix/fix_api_controler:
  restore api controller
added display to events
Merge branch 'develop'

* develop:
  added display to events