Capacity logic on Reservation model
Merge fix
Merge fix