Merge branch 'develop' into feature/events
Add entry to event.show
Merge branch 'feature/events' into develop