Merge pull request #123 from kheang/master

Updated calendar
Merge https://github.com/lunchpad/lunchpad
merge
added a few html wrappers