Actually fixed so table bookings are no longer valid when there's no tables available.
Merge origin/master