Fix up the embedding of locations etc in th esession. Do contacts as well to take them out of the form.

Fix the cloning of calendars. Bug dropped the children and we should have been cloning the wrapper.