Calendar is now serializable to XML; no deserialization yet.
Deserialiazation added for events and containers
Conflict resolve