Merging files from Calendar branch to Master