Merge branch 'hotfix/edit_banner_to_mini'

* hotfix/edit_banner_to_mini:
  banner edited
after conference
Merge branch 'hotfix/remove_banner_after_conference' into develop

* hotfix/remove_banner_after_conference:
  after conference