Merge branch 'feature/event_calendar' into develop
fix conference event paper submition deadline
Merge branch 'develop' into feature/event_calendar