Merge branch 'master' into fix-some-warnings

Conflicts:
	SoObjects/Appointments/SOGoAppointmentObject.m

SoObjects/Appointments/SOGoCalendarComponent.m

@@ -675,6 +675,12 @@
   return [self saveCalendar: [newObject parent]];
 }
 
+- (NSException *) saveComponent: (iCalRepeatableEntityObject *) newEvent
+                          force: (BOOL) forceSave
+{
+  return [self saveComponent: newEvent];
+}
+
 /* raw saving */
 
 /* EMail Notifications */