alina PC
Merge branch 'dev' of https://github.com/vovkmaxim/kompas into dev
alia branch
alina pc commit
alina prij
merge alina dev
fix calendar