#13 Calendar fixed
Merge branch 'frontend_implementation' into Development