Fixes
Merge branch 'release' of https://github.com/interactive-events/web-app into release