Reservation working
Merge branch 'registration'