fix calendar null
Merge branch 'master' of https://github.com/NhamPhanDinh/smmatest