Merge branch 'calendar-view' into 'dev-v2'

Calendar view

See merge request !31
1 job for dev-v2 in 2 minutes and 16 seconds (queued for 9 seconds)