return to old calender version because it is suitable for us
Merge remote-tracking branch 'origin/master'