front-end and calendar
Merge branch 'master' of https://github.com/osamak/student-portal

Merge on 3 May 00:56