Calendar appears but still with bugs
Merge branch 'master' of https://github.com/woodmandev/Whiteboard