Merge branch 'master' into fix-some-warnings

Conflicts:
	UI/Scheduler/UIxAppointmentActions.m

SoObjects/Appointments/SOGoAppointmentObject.m

@@ -652,7 +652,7 @@
               else
                 {
                   iCalCalendar *calendar;
-                  NSDictionary *values;
+                  NSDictionary *values, *info;
                   NSString *reason;
                   iCalEvent *event;
 
@@ -669,8 +669,10 @@
 
                   reason = [values keysWithFormat: [self labelForKey: @"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}."]];
 
+                  info = [NSDictionary dictionaryWithObject: reason forKey: @"reject"];
+
                   return [NSException exceptionWithHTTPStatus: 403
-                                                       reason: reason];
+                                                       reason: [info jsonRepresentation]];
                 }
             }
           //

SoObjects/Appointments/SOGoComponentOccurence.m

@@ -1,6 +1,6 @@
 /* SOGoComponentOccurence.m - this file is part of SOGo
  * 
- * Copyright (C) 2008-2014 Inverse inc.
+ * Copyright (C) 2008-2016 Inverse inc.
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -204,6 +204,13 @@
   return [container saveComponent: newObject];
 }
 
+- (NSException *) saveComponent: (iCalRepeatableEntityObject *) newObject
+                          force: (BOOL) forceSave
+{
+  return [container saveComponent: newObject
+                            force: forceSave];
+}
+
 #warning most of SOGoCalendarComponent and SOGoComponentOccurence share the same external interface... \
   they should be siblings or SOGoComponentOccurence the parent class of SOGoCalendarComponent...
 - (NSException *) changeParticipationStatus: (NSString *) newStatus