working calendar at /calendar and /events
merge cal