Merge branch 'master' into fix-some-warnings

Conflicts:
	UI/Scheduler/UIxAppointmentActions.m

UI/Scheduler/UIxAppointmentEditor.m

@@ -454,6 +454,7 @@
   SOGoAppointmentObject *co;
   SoSecurityManager *sm;
   WORequest *request;
+  id error;
 
   unsigned int httpStatus;
   BOOL forceSave;
@@ -477,7 +478,7 @@
   else
     {
       [self setAttributes: params];
-      forceSave = NO;
+      forceSave = [[params objectForKey: @"ignoreConflicts"] boolValue];
 
       if ([event hasRecurrenceRules])
         [self _adjustRecurrentRules];
@@ -533,9 +534,11 @@
       if ([ex respondsToSelector: @selector(httpStatus)])
         httpStatus = [ex httpStatus];
 
+      error = [[ex reason] objectFromJSONString];
+      if (error == nil)
+        error = [ex reason];
       jsonResponse = [NSDictionary dictionaryWithObjectsAndKeys:
-                                     [ex reason], @"message",
-                                   nil];
+                                     error, @"message", nil];
     }
   else
     {