#calendar
Merge branch 'templating' into dev-master
#calendar event customization
Merge branch 'staging' into templating