Adding default calendar configuration
Updating prolusion.
Merging upstream