calendar frontend design
Merge branch 'calendar_frontend'