Merged Create and David_calendar branches

Merged Create and David_calendar branches