Merge pull request #22 from DeX3/qa

Reworked reservations and rooms a bit