Merge calendar into dev