Calendar added to pop-up and data model
Merge branch 'charme_add_calendar' into develop