Small fixes
Merge branches 'FINALIZING' and 'master' of https://github.com/chunfantasy/calendar into FINALIZING
Merge branch 'master' of https://github.com/chunfantasy/calendar into FINALIZING
Small fixes
Merge pull request #65 from chunfantasy/FINALIZING

FINALIZING