added calendar and calendar feature
Merge branch 'master' of https://github.com/ec-mdecker/ec-distro