Take pre-reservations into account for waiting list

- order waiting list by pre-reservation id
- take unredeemed pre-reservations into account in the number of remaining places
Comment out for now
Count remaining places properly when actually doing a reservation

Don't count my pre-reservation as an indication that a place has been consumed. I'm about to use it!