Fixed defects 1. and 2.
Merge branch 'master' of https://github.com/AdnanZi/RoomReservation.git