Merge remote-tracking branch 'origin/AddUpdateEvent'

Conflicts:
	CalendarApplication.v11.suo
	CalendarApplication/bin/Debug/CalendarApplication.exe
	CalendarApplication/bin/Debug/CalendarApplication.pdb
	CalendarApplication/obj/Debug/CalendarApplication.exe
	CalendarApplication/obj/Debug/CalendarApplication.pdb