changes to calendar plus switch metods
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/model/calendar/CalendarEvents.java