Added export to calendar button
Merge conflict