Merge branch 'develop' into hotel-booking-101
Created a feature for flag hotel. Ticket #101
Merge pull request #108 from Luukyb/hotel-booking-101

Created a feature for flag hotel. Ticket #101