First merge develop and Feature/event_calendar

First merge develop and Feature/event_calendar