moved calendar content to the correct area
Merge branch 'master' of https://github.com/john098/HCFTW
Merge branch 'master' of https://github.com/john098/HCFTW