Bugfix/reservationsystem

ReservationSystem updates to get master compiling again