last changes for testing
Merge branch 'master' of https://github.com/infotechnab/Reservation

Conflicts:
	application/views/ReservationInformation/room_booking.php