[r=salgado] some cleanup of calendar templates
Patches applied:

 * mpt@canonical.com/launchpad--calendar-cleanup--0--base-0
   tag of mpt@canonical.com/launchpad--devel--0--patch-85

 * mpt@canonical.com/launchpad--calendar-cleanup--0--patch-1
   calendar template cleanup

 * mpt@canonical.com/launchpad--calendar-cleanup--0--patch-2
   merge rocketfuel

 * mpt@canonical.com/launchpad--calendar-cleanup--0--patch-3
   fix pagetest

 * mpt@canonical.com/launchpad--devel--0--patch-84
   merge rocketfuel

 * mpt@canonical.com/launchpad--devel--0--patch-85
   merge rocketfuel