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]];
                 }
             }
           //