Merge branch 'feature/event_calendar' into develop
Merge branch 'develop' into feature/event_calendar