Fixed calendar time bug
Fixed event time issue
Merge branch 'master' of https://github.com/kaldrenon/glowing-octo-adventure