integrating plugin into the theme
Merge branch 'calendar' into dev