Merge calendar development into master