fixes to calendar dao and API, and committee api
merge