Adding changes for Viewing a calendar and a specific event.
Committing App_Data conflict fix