** Calendar listing functionality
Merge origin/FTR-40_CALEVT into FTR-40_CALEVT
Google Calendar ID listing in listCalendars
Service provider aggregation in CalendarController
Merge origin/FTR-40_CALEVT into FTR-40_CALEVT
Merge origin/FTR-40_CALEVT into FTR-40_CALEVT

Conflicts:
	muikku-core-plugins/src/main/java/fi/muikku/plugins/calendar/CalendarController.java
	muikku-core/src/main/java/fi/muikku/calendar/CalendarServiceProvider.java