calendar fixes
Merge branch 'master' of github.com:navyon/caporal