Refactor at message User on MakeReservationBySpace
Merge origin/master